pi-roundtable 0.33.0 → 0.35.0

package/src/core/routing/claim-events.ts

@@ -1,6 +1,6 @@
 import type { ChannelClaim, InboundMessage } from "../contract/channels.ts";
-import type { Logger } from "../log.ts";
-import type { ChannelKey } from "../sessions.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
+import type { Logger } from "../kernel/log.ts";
 
 /** Tells the claim a message in its channel was deleted; a claim without the hook, or none, is skipped. Never rejects. */
 export async function tellDeleted(

package/src/core/routing/conversation-turns.ts

@@ -9,14 +9,18 @@ import type { ClientPort } from "../domain/client.ts";
 import type { TurnResult } from "../domain/conversation.ts";
 import type { TurnConversation } from "../domain/ports.ts";
 import type { TurnProgress } from "../domain/progress.ts";
-import { HostStoppingError, PluginError } from "../errors.ts";
+import type {
+	ChannelKey,
+	ToolSelection,
+	TurnSelection,
+} from "../domain/sessions.ts";
 import { SYSTEM_PRINCIPAL } from "../identity/principal-store.ts";
-import type { Logger } from "../log.ts";
-import type { EventSink } from "../plugin.ts";
+import type { Speaker } from "../identity/speakers.ts";
+import { HostStoppingError, PluginError } from "../kernel/errors.ts";
+import type { Logger } from "../kernel/log.ts";
+import type { EventSink } from "../plugin-api/plugin.ts";
 import { isQuiet, replyBody } from "../presentation/reply-body.ts";
-import { withReplyFiles } from "../reply-files.ts";
-import type { ChannelKey, ToolSelection, TurnSelection } from "../sessions.ts";
-import type { Speaker } from "../speakers.ts";
+import { withReplyFiles } from "../shared/reply-files.ts";
 import { endOf, settleTurn } from "./settle-turn.ts";
 
 /** One turn of a conversation, as a claim asks for it. */

package/src/core/routing/forward-join.ts

@@ -1,5 +1,5 @@
 import type { InboundMessage } from "../contract/channels.ts";
-import type { ChannelKey } from "../sessions.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
 
 /** Discord sends a forward's added text as a second message right after the forward. */
 export const FORWARD_JOIN_MS = 2_000;

package/src/core/routing/message-observers.ts

@@ -4,7 +4,7 @@ import type {
 	ObserveFilter,
 } from "../contract/channels.ts";
 import { parseChannelKey } from "../contract/surface.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 
 interface Registered {
 	filter: Readonly<ObserveFilter>;

package/src/core/routing/message-text.ts

@@ -1,6 +1,6 @@
 import { parseChannelKey } from "../contract/surface.ts";
 import type { ChannelKey, InboundMessage } from "../domain/conversation.ts";
-import type { OwnerIdentity } from "../identity.ts";
+import type { OwnerIdentity } from "../identity/owner-identity.ts";
 
 /** How the model is told where a forward came from: a Discord channel as its mention, another surface's as its key. */
 function sourceLabel(source: ChannelKey): string {

package/src/core/routing/peer-bots.ts

@@ -1,80 +1,12 @@
 import {
-	bool,
-	either,
-	type Field,
-	integer,
-	list,
-	optional,
-	shape,
-	text,
-} from "../config/schema.ts";
+	DEFAULT_PEER_ROUNDS,
+	type PeerBotEntry,
+	type PeerBotsConfig,
+	peerBotsShape,
+} from "../config/peer-bots.ts";
 import type { InboundMessage } from "../contract/channels.ts";
 import { parseChannelKey } from "../contract/surface.ts";
-import { ConfigError } from "../domain/errors.ts";
-import type { ChannelKey } from "../sessions.ts";
-
-/** One peer bot the host answers, and where. */
-export interface PeerBotEntry {
-	/** The bot's user id on the surface, a Discord snowflake. */
-	id: string;
-	/** Answer it only in these servers; left out, in every server of the host. */
-	guilds?: readonly string[];
-	/** Answer it only in these channels; left out, in every channel. */
-	channels?: readonly string[];
-	/**
-	 * Leave to this bot a person's message that addresses both: when a person mentions or replies to
-	 * the host and in the same message mentions this bot or replies to it, the host starts no turn
-	 * (observers still hear the message), so only this bot answers and it can hand over by mentioning
-	 * the host. Where `guilds` and `channels` do not list the bot, the host does not yield to it.
-	 * Set it on one side only: two hosts that yield to each other both stay silent.
-	 */
-	yields?: boolean;
-}
-
-/**
- * The other bots whose messages the host answers like a guest's. Explicit ids only: there is no
- * wildcard and no "all bots", and a host that leaves this out answers no bot.
- */
-export interface PeerBotsConfig {
-	/** The peer bots, each by its user id or as an entry that limits it to servers or channels. */
-	allow: readonly (string | PeerBotEntry)[];
-	/**
-	 * The most messages from peer bots in a row, in one channel, that start a turn before the next
-	 * one is ignored; a person's message in the channel starts the count over. Default 3.
-	 */
-	maxRounds?: number;
-}
-
-/** The rounds in a row a channel answers peer bots when the host does not say. */
-export const DEFAULT_PEER_ROUNDS = 3;
-
-const SNOWFLAKE = /^[0-9]{17,20}$/;
-
-/** A Discord id: 17 to 20 digits. */
-const snowflake: Field<string> = {
-	describe: "a Discord id (17 to 20 digits)",
-	check: (value, path) => {
-		const id = text.check(value, path);
-		if (!SNOWFLAKE.test(id))
-			throw new ConfigError(
-				`config ${path}: expected a Discord id (17 to 20 digits), got ${JSON.stringify(id)}. Copy the id with Developer Mode on; a name or a wildcard is not accepted. Fix the value in roundtable.config.ts.`,
-			);
-		return id;
-	},
-};
-
-const entryShape = shape({
-	id: snowflake,
-	guilds: optional(list(snowflake)),
-	channels: optional(list(snowflake)),
-	yields: optional(bool),
-});
-
-/** `discord.peerBots`, or the `peerBots` of the host's options. */
-export const peerBotsShape = shape({
-	allow: list(either(snowflake, entryShape)),
-	maxRounds: optional(integer(1, 100)),
-});
+import type { ChannelKey } from "../domain/sessions.ts";
 
 /**
  * The peer bots a host answers, and how many of their messages in a row a channel answers.

package/src/core/routing/queued-messages.ts

@@ -7,8 +7,8 @@ import {
 	type QueuedChange,
 	type QueuedMessage,
 } from "../contract/channels.ts";
-import type { Logger } from "../log.ts";
-import type { ChannelKey } from "../sessions.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
+import type { Logger } from "../kernel/log.ts";
 
 type TurnAdmission = Extract<Admission, { kind: "turn" }>;
 

package/src/core/routing/settle-turn.ts

@@ -1,7 +1,7 @@
 import type { ScheduledOutcome } from "../contract/channels.ts";
 import type { TurnResult } from "../domain/conversation.ts";
 import { AgentRunError } from "../domain/errors.ts";
-import type { TurnEndEvent } from "../plugin.ts";
+import type { TurnEndEvent } from "../plugin-api/plugin.ts";
 
 /** Runs a turn; a thrown error becomes its failed result, labelled `<what> crashed`. */
 export async function settleTurn<R>(

package/src/core/routing/surface-port.ts

@@ -1,13 +1,13 @@
 import type { ChatSurface, SurfacePort } from "../contract/surface.ts";
 import { parseChannelKey } from "../contract/surface.ts";
-import { PluginError } from "../errors.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
+import type { Speaker } from "../identity/speakers.ts";
 import {
 	isPromptScope,
 	type PromptScope,
 	promptScope,
 } from "../interactions/prompts.ts";
-import type { ChannelKey } from "../sessions.ts";
-import type { Speaker } from "../speakers.ts";
+import { PluginError } from "../kernel/errors.ts";
 
 export interface SurfacePortOptions {
 	/** Told when a caller uses a form that goes away, such as `prompts(channel, speaker)`. */

package/src/core/runtime/ask-questions.ts

@@ -1,5 +1,5 @@
 import { messages } from "../i18n/index.ts";
-import type { OwnerIdentity } from "../identity.ts";
+import type { OwnerIdentity } from "../identity/owner-identity.ts";
 import type { OwnerAnswer, Prompts } from "../interactions/prompts.ts";
 import {
 	type Questionnaire,

package/src/core/runtime/bridge-guard.ts

@@ -6,16 +6,16 @@ import type {
 } from "@earendil-works/pi-coding-agent";
 import type { AgentSessions } from "../contract/runtime.ts";
 import { AgentRunError, ConfigError } from "../domain/errors.ts";
-import type { AccessRules, AccessTier } from "../identity/access-policy.ts";
-import type { IdentityService } from "../identity/identity-service.ts";
-import { SYSTEM_PRINCIPAL } from "../identity/principal-store.ts";
 import {
 	formatModelRef,
 	type ModelRef,
 	parseModelRef,
 	type ThinkingSetting,
-} from "../models.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
+} from "../domain/models.ts";
+import type { AccessRules, AccessTier } from "../identity/access-policy.ts";
+import type { IdentityService } from "../identity/identity-service.ts";
+import { SYSTEM_PRINCIPAL } from "../identity/principal-store.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
 import { guardHidesPrivateExchange } from "./extensions/private-memory.ts";
 import { bridgeHistoryHidesMemoryFor } from "./reader-history.ts";
 

package/src/core/runtime/chat-only.ts

@@ -1,6 +1,6 @@
 import { ConfigError } from "../domain/errors.ts";
 import { SHELL_TOOLS } from "../modules/host-shell/shell-policy.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
 
 const CHAT_ONLY = 'agentServer: { tools: "chat-only" }';
 

package/src/core/runtime/conversation-sessions.ts

@@ -5,9 +5,8 @@ import type {
 	ChannelKey,
 	PendingConfirmation,
 } from "../domain/conversation.ts";
+import type { ThinkingLevel } from "../domain/models.ts";
 import type { TurnConversation, TurnRequest } from "../domain/ports.ts";
-import type { ThinkingLevel } from "../models.ts";
-import type { ToolTiers } from "../tool-tiers.ts";
 import { ConfirmationGate, unexpired } from "./extensions/confirmation-gate.ts";
 import { PromptSlot } from "./prompt-slot.ts";
 import type { ChannelSession, PiAgentRuntimeOptions } from "./runtime-types.ts";
@@ -23,6 +22,7 @@ import {
 	historyScope,
 	scopedHistory,
 } from "./session-scope.ts";
+import type { ToolTiers } from "./tool-tiers.ts";
 
 type AgentMessage = AgentSession["messages"][number];
 

package/src/core/runtime/extensions/agent-prompt.ts

@@ -1,5 +1,5 @@
 import type { ExtensionFactory } from "@earendil-works/pi-coding-agent";
-import type { Logger } from "../../log.ts";
+import type { Logger } from "../../kernel/log.ts";
 import { readPromptOrStop } from "./prompt-read.ts";
 
 /**

package/src/core/runtime/extensions/ask-user-text.ts

@@ -1,4 +1,8 @@
-import { type OwnerIdentity, ownerWords, PRONOUNS } from "../../identity.ts";
+import {
+	type OwnerIdentity,
+	ownerWords,
+	PRONOUNS,
+} from "../../identity/owner-identity.ts";
 import type {
 	OwnerAnswer,
 	OwnerQuestion,

package/src/core/runtime/extensions/ask-user.ts

@@ -1,6 +1,9 @@
 import type { ExtensionFactory } from "@earendil-works/pi-coding-agent";
 import { type Static, Type } from "typebox";
-import { type OwnerIdentity, ownerWords } from "../../identity.ts";
+import {
+	type OwnerIdentity,
+	ownerWords,
+} from "../../identity/owner-identity.ts";
 import type { OwnerQuestion } from "../../interactions/prompts.ts";
 import { QUESTIONNAIRE_LIMITS as L } from "../../interactions/questionnaire.ts";
 import { DEFAULT_YOLO_QUESTION_GRACE_MS } from "../../modes/autonomy.ts";

package/src/core/runtime/extensions/card-ask.ts

@@ -1,3 +1,4 @@
+import type { Tier } from "../../identity/speakers.ts";
 import type {
 	Approval,
 	ApprovalDetails,
@@ -6,7 +7,6 @@ import type {
 	Prompts,
 	PromptWait,
 } from "../../interactions/prompts.ts";
-import type { Tier } from "../../speakers.ts";
 import type { Watch } from "./withdrawals.ts";
 
 /** What a held call's card is opened with. */

package/src/core/runtime/extensions/confirmation-fixture.ts

@@ -1,4 +1,4 @@
-import type { HoldRule } from "../../holds.ts";
+import type { HoldRule } from "../../plugin-api/holds.ts";
 
 /** A tool that waits for the owner's confirmation in the gate's tests. */
 export const MAIL = "send-mail";

package/src/core/runtime/extensions/confirmation-gate-extension.ts

@@ -1,5 +1,5 @@
 import type { ExtensionFactory } from "@earendil-works/pi-coding-agent";
-import type { ToolTurn } from "../../define.ts";
+import type { ToolTurn } from "../../plugin-api/define.ts";
 import type { PromptSlot } from "../prompt-slot.ts";
 import type { ConfirmationGate, HoldTurn } from "./confirmation-gate.ts";
 

package/src/core/runtime/extensions/confirmation-gate.ts

@@ -2,17 +2,17 @@ import type {
 	HeldCall,
 	PendingConfirmation,
 } from "../../domain/conversation.ts";
+import { messages } from "../../i18n/index.ts";
+import type { OwnerIdentity } from "../../identity/owner-identity.ts";
+import type { ApprovedBy, Prompts } from "../../interactions/prompts.ts";
 import {
 	HOLD_DESCRIBE_TIMEOUT_MS,
 	type HoldCheck,
 	type HoldContext,
 	higherTier,
 	isPromise,
-} from "../../holds.ts";
-import { messages } from "../../i18n/index.ts";
-import type { OwnerIdentity } from "../../identity.ts";
-import type { ApprovedBy, Prompts } from "../../interactions/prompts.ts";
-import type { ToolTiers } from "../../tool-tiers.ts";
+} from "../../plugin-api/holds.ts";
+import type { ToolTiers } from "../tool-tiers.ts";
 import { approvalCard, approvalDetails } from "./approval-card.ts";
 import { askOnCard } from "./card-ask.ts";
 import {

package/src/core/runtime/extensions/gate-refusals.ts

@@ -3,12 +3,15 @@ import type {
 	PendingConfirmation,
 } from "../../domain/conversation.ts";
 import type { HoldRefusal } from "../../domain/progress.ts";
-import { type OwnerIdentity, ownerWords } from "../../identity.ts";
+import {
+	type OwnerIdentity,
+	ownerWords,
+} from "../../identity/owner-identity.ts";
+import type { Speaker } from "../../identity/speakers.ts";
 import type {
 	ApprovalDetails,
 	ApprovedBy,
 } from "../../interactions/prompts.ts";
-import type { Speaker } from "../../speakers.ts";
 import { mayApproveNamed } from "./held-calls.ts";
 
 /**

package/src/core/runtime/extensions/held-calls.ts

@@ -2,9 +2,9 @@ import type {
 	HeldCall,
 	PendingConfirmation,
 } from "../../domain/conversation.ts";
-import type { OwnerIdentity } from "../../identity.ts";
+import type { OwnerIdentity } from "../../identity/owner-identity.ts";
+import type { Speaker } from "../../identity/speakers.ts";
 import type { ApprovedBy } from "../../interactions/prompts.ts";
-import type { Speaker } from "../../speakers.ts";
 
 /** Held actions older than this cannot be approved any more. */
 export const CONFIRMATION_TTL_MS = 24 * 3_600_000;

package/src/core/runtime/extensions/hold-describer.ts

@@ -1,12 +1,12 @@
-import type { ToolTurn } from "../../define.ts";
+import { messages } from "../../i18n/index.ts";
+import type { ToolTurn } from "../../plugin-api/define.ts";
 import {
 	type ClassedHold,
 	type HoldCheck,
 	type HoldContext,
 	type HoldDescription,
 	isPromise,
-} from "../../holds.ts";
-import { messages } from "../../i18n/index.ts";
+} from "../../plugin-api/holds.ts";
 import {
 	awaited,
 	type Described,

package/src/core/runtime/extensions/hold-lookups.ts

@@ -1,13 +1,13 @@
-import type { ToolTurn } from "../../define.ts";
 import type { HeldCall } from "../../domain/conversation.ts";
+import { messages } from "../../i18n/index.ts";
+import type { ApprovalDetails } from "../../interactions/prompts.ts";
+import type { ToolTurn } from "../../plugin-api/define.ts";
 import {
 	type HoldCheck,
 	type HoldContext,
 	type HoldDescription,
 	isPromise,
-} from "../../holds.ts";
-import { messages } from "../../i18n/index.ts";
-import type { ApprovalDetails } from "../../interactions/prompts.ts";
+} from "../../plugin-api/holds.ts";
 import { canonicalJson } from "./held-calls.ts";
 
 /** The turn a hold that looks things up sees; see `HoldRule.describeInTurn`. */

package/src/core/runtime/extensions/persona-prompt.ts

@@ -1,5 +1,5 @@
 import type { ExtensionFactory } from "@earendil-works/pi-coding-agent";
-import type { Logger } from "../../log.ts";
+import type { Logger } from "../../kernel/log.ts";
 import { readPromptOrStop } from "./prompt-read.ts";
 
 /**

package/src/core/runtime/extensions/prompt-read.ts

@@ -1,4 +1,4 @@
-import type { Logger } from "../../log.ts";
+import type { Logger } from "../../kernel/log.ts";
 
 /**
  * Reads a prompt for the run that is starting. Pi swallows what a `before_agent_start` handler

package/src/core/runtime/extensions/yolo.ts

@@ -1,11 +1,11 @@
 import type { HeldCall } from "../../domain/conversation.ts";
 import type { TurnRequest } from "../../domain/ports.ts";
+import type { ChannelKey } from "../../domain/sessions.ts";
 import { SYSTEM_PRINCIPAL } from "../../identity/principal-store.ts";
 import type { ApprovedBy } from "../../interactions/prompts.ts";
 import { type Autonomy, DEFAULT_AUTONOMY } from "../../modes/autonomy.ts";
 import type { ConversationModes } from "../../modes/conversation-modes.ts";
 import { YOLO_CARDED_SHELL_CLASSES } from "../../modules/host-shell/shell-policy.ts";
-import type { ChannelKey } from "../../sessions.ts";
 import type { PiAgentRuntimeOptions } from "../runtime-types.ts";
 import type { AutoApprover } from "./confirmation-gate.ts";
 import type { SpeakerRef } from "./gate-refusals.ts";

package/src/core/runtime/interim-text.ts

@@ -1,6 +1,6 @@
 import type { InterimMessage, InterimPosts } from "../domain/interim.ts";
 import type { TurnRequest } from "../domain/ports.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 import {
 	DISCORD_MESSAGE_LIMIT,
 	splitReply,

package/src/core/runtime/pi-agent-runtime.ts

@@ -18,12 +18,11 @@ import type {
 } from "../domain/conversation.ts";
 import { AgentRunError } from "../domain/errors.ts";
 import type { TurnRequest } from "../domain/ports.ts";
-import { HostStoppingError } from "../errors.ts";
+import type { TransientTask } from "../domain/sessions.ts";
 import { assistantName } from "../i18n/index.ts";
 import { promptScopeOf } from "../interactions/prompts.ts";
-import { withoutReplyFiles } from "../reply-files.ts";
-import type { TransientTask } from "../sessions.ts";
-import { type ToolTiers, toolTiers } from "../tool-tiers.ts";
+import { HostStoppingError } from "../kernel/errors.ts";
+import { withoutReplyFiles } from "../shared/reply-files.ts";
 import { AbortGuard } from "./abort-guard.ts";
 import { bridgeTurnRefusal, chosenAgentModel } from "./bridge-guard.ts";
 import { ConversationSessions } from "./conversation-sessions.ts";
@@ -47,6 +46,7 @@ import { SessionFactory } from "./session-factory.ts";
 import { promptImages, SteerableRun } from "./steerable-run.ts";
 import { thinkingLevel } from "./thinking-level.ts";
 import { runningCalls } from "./tool-call-scope.ts";
+import { type ToolTiers, toolTiers } from "./tool-tiers.ts";
 import { transcriptOf, turnAnswer, unspokenTurn } from "./turn-answer.ts";
 import type { TurnBudget } from "./turn-budget.ts";
 import { promptFailed, turnLimits } from "./turn-limits.ts";

package/src/core/runtime/running-turn.ts

@@ -1,6 +1,6 @@
 import type { ClientPort } from "../domain/client.ts";
 import type { TurnRequest } from "../domain/ports.ts";
-import type { Speaker, Tier } from "../speakers.ts";
+import type { Speaker, Tier } from "../identity/speakers.ts";
 
 /** What the runtime keeps about a conversation's running turn, for its tools to read. */
 export interface RunningTurn {

package/src/core/runtime/runtime-plugin.ts

@@ -7,20 +7,25 @@ import type {
 } from "../contract/runtime.ts";
 import type { ChannelKey } from "../domain/conversation.ts";
 import type { InterimTextMode } from "../domain/interim.ts";
-import type { IdentityService } from "../identity/identity-service.ts";
-import type { OwnerIdentity } from "../identity.ts";
-import type { PromptScope } from "../interactions/prompts.ts";
-import { AGENT_BRIEF, EffortJudge } from "../judging/effort-judge.ts";
 import {
 	type EffortPolicy,
 	formatModelRef,
 	type ModelRef,
 	type ThinkingLevel,
-} from "../models.ts";
+} from "../domain/models.ts";
+import type { IdentityService } from "../identity/identity-service.ts";
+import type { OwnerIdentity } from "../identity/owner-identity.ts";
+import type { Speaker } from "../identity/speakers.ts";
+import type { PromptScope } from "../interactions/prompts.ts";
+import { AGENT_BRIEF, EffortJudge } from "../judging/effort-judge.ts";
 import type { Autonomy } from "../modes/autonomy.ts";
-import type { PluginContext, RoundtablePlugin } from "../plugin.ts";
-import { CONVERSATIONS, IDENTITY, MODES, RUNTIME } from "../services.ts";
-import type { Speaker } from "../speakers.ts";
+import type { PluginContext, RoundtablePlugin } from "../plugin-api/plugin.ts";
+import {
+	CONVERSATIONS,
+	IDENTITY,
+	MODES,
+	RUNTIME,
+} from "../plugin-api/services.ts";
 import {
 	BRIDGE_MEMORY_FIX,
 	bridgeMemoryProblem,

package/src/core/runtime/runtime-types.ts

@@ -8,28 +8,32 @@ import type { ImageDrawer } from "../contract/providers.ts";
 import type { AgentSessions, LoadedSkill } from "../contract/runtime.ts";
 import type { ChannelKey } from "../domain/conversation.ts";
 import type { InterimTextMode } from "../domain/interim.ts";
+import type {
+	EffortPolicy,
+	ThinkingLevel,
+	ThinkingPicker,
+} from "../domain/models.ts";
 import type { TurnConversation } from "../domain/ports.ts";
-import type { Principal } from "../identity/principal-store.ts";
-import type { OwnerIdentity } from "../identity.ts";
-import type { PromptScope, Prompts } from "../interactions/prompts.ts";
-import type { Logger } from "../log.ts";
-import type { EffortPolicy, ThinkingLevel, ThinkingPicker } from "../models.ts";
-import type { Autonomy } from "../modes/autonomy.ts";
-import type { ConversationModes } from "../modes/conversation-modes.ts";
-import type { AgentTools, LinkedSessions } from "../plugin.ts";
 import {
 	planOrder,
 	type SessionContext,
 	type SessionConversation,
 	type SessionPlan,
 	type SessionTool,
-} from "../sessions.ts";
+} from "../domain/sessions.ts";
+import type { OwnerIdentity } from "../identity/owner-identity.ts";
+import type { Principal } from "../identity/principal-store.ts";
+import type { PromptScope, Prompts } from "../interactions/prompts.ts";
+import type { Logger } from "../kernel/log.ts";
+import type { Autonomy } from "../modes/autonomy.ts";
+import type { ConversationModes } from "../modes/conversation-modes.ts";
+import type { AgentTools, LinkedSessions } from "../plugin-api/plugin.ts";
 import type { ShellEnv } from "../shared/child-env.ts";
 import { secretMaskExtension } from "../shared/secret-mask.ts";
-import type { ToolTiers } from "../tool-tiers.ts";
 import type { MemoryDraws } from "./extensions/private-memory.ts";
 import type { PendingConfirmationStore } from "./pending-confirmation-store.ts";
 import { scopedCalls } from "./tool-call-scope.ts";
+import type { ToolTiers } from "./tool-tiers.ts";
 
 export type TurnMessage = Extract<
 	AgentSessionEvent,

package/src/core/runtime/session-conversation.ts

@@ -1,12 +1,12 @@
 import type { ChannelKey } from "../domain/conversation.ts";
 import type { TurnConversation, TurnRequest } from "../domain/ports.ts";
+import type { SessionConversation } from "../domain/sessions.ts";
+import { addresseeOf, type OwnerIdentity } from "../identity/owner-identity.ts";
 import {
 	type Principal,
 	SYSTEM_PRINCIPAL,
 } from "../identity/principal-store.ts";
-import { addresseeOf, type OwnerIdentity } from "../identity.ts";
-import type { SessionConversation } from "../sessions.ts";
-import { addressee, type Speaker, THE_SPEAKER } from "../speakers.ts";
+import { addressee, type Speaker, THE_SPEAKER } from "../identity/speakers.ts";
 import type { PiAgentRuntimeOptions } from "./runtime-types.ts";
 
 /**

package/src/core/runtime/session-factory.ts

@@ -12,7 +12,6 @@ import type { ClientPort } from "../domain/client.ts";
 import type { ChannelKey } from "../domain/conversation.ts";
 import { ConfigError } from "../domain/errors.ts";
 import type { AgentTurnScope } from "../domain/ports.ts";
-import type { LinkedSessions } from "../plugin.ts";
 import {
 	planOrder,
 	type SessionContext,
@@ -20,7 +19,10 @@ import {
 	type SessionPlan,
 	type ToolSelection,
 	type TransientTask,
-} from "../sessions.ts";
+} from "../domain/sessions.ts";
+import { type Speaker, THE_SPEAKER } from "../identity/speakers.ts";
+import type { LinkedSessions } from "../plugin-api/plugin.ts";
+import { toolTurn } from "../plugin-api/tool-turn.ts";
 import { activeToolsExtension } from "../shared/active-tools.ts";
 import {
 	ATTACH_FILE_TOOL,
@@ -29,9 +31,6 @@ import {
 import { GENERATE_IMAGE_TOOL } from "../shared/generate-image-tool.ts";
 import { packageDir } from "../shared/package-dir.ts";
 import { readAttachmentExtension } from "../shared/read-attachment-tool.ts";
-import { type Speaker, THE_SPEAKER } from "../speakers.ts";
-import { currentToolNames } from "../tool-tiers.ts";
-import { toolTurn } from "../tool-turn.ts";
 import { refuseShellTools } from "./chat-only.ts";
 import {
 	CompactionTiers,
@@ -72,6 +71,7 @@ import {
 	turnAddressee,
 } from "./session-conversation.ts";
 import { imageTools, scratchBash } from "./session-helpers.ts";
+import { currentToolNames } from "./tool-tiers.ts";
 
 export { imageTools, scratchBash };
 

package/src/core/runtime/thinking-level.ts

@@ -3,12 +3,12 @@ import type {
 	ModelRuntime,
 } from "@earendil-works/pi-coding-agent";
 import type { ChannelKey } from "../domain/conversation.ts";
-import type { TurnRequest } from "../domain/ports.ts";
 import {
 	AUTO_THINKING,
 	type EffortPolicy,
 	type ThinkingLevel,
-} from "../models.ts";
+} from "../domain/models.ts";
+import type { TurnRequest } from "../domain/ports.ts";
 import {
 	type AgentModelSettings,
 	useChosenAgentModel,