pi-roundtable 0.34.0 → 0.35.0

package/src/core/contract/surface.ts

@@ -2,10 +2,10 @@ import type { OutboundReply, PostAuthor } from "../domain/conversation.ts";
 import type { InterimMessage, InterimPosts } from "../domain/interim.ts";
 import type { TurnProgress } from "../domain/progress.ts";
 import type { RoundProgress } from "../domain/round.ts";
-import { PluginError } from "../errors.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
+import type { Speaker } from "../identity/speakers.ts";
 import type { PromptScope, Prompts } from "../interactions/prompts.ts";
-import type { ChannelKey } from "../sessions.ts";
-import type { Speaker } from "../speakers.ts";
+import { PluginError } from "../kernel/errors.ts";
 import type {
 	ChannelContext,
 	ChannelContextOptions,

package/src/core/conversations/conversation-registry.ts

@@ -1,4 +1,4 @@
-import type { ChannelKey } from "../sessions.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
 
 /** Who may take part: `private` belongs to one principal, `shared` to whoever its claim admits. */
 export type ConversationVisibility = "private" | "shared";

package/src/core/conversations/conversation-retention.ts

@@ -1,6 +1,6 @@
 import type { ConversationPort } from "../contract/channels.ts";
-import type { Logger } from "../log.ts";
-import type { Service } from "../plugin.ts";
+import type { Logger } from "../kernel/log.ts";
+import type { Service } from "../plugin-api/plugin.ts";
 import type {
 	ConversationRecord,
 	ConversationRegistry,

package/src/core/conversations/conversation-store.ts

@@ -1,7 +1,7 @@
 import type { SQL } from "bun";
 import { parseChannelKey } from "../contract/surface.ts";
 import type { Migration } from "../db/migrations.ts";
-import type { ChannelKey } from "../sessions.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
 import type {
 	ConversationRecord,
 	ConversationRegistration,

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

@@ -1,6 +1,6 @@
 import type { SQL } from "bun";
-import type { RoundtablePlugin } from "../plugin.ts";
-import { CONVERSATIONS } from "../services.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
+import { CONVERSATIONS } from "../plugin-api/services.ts";
 import type { ConversationRegistry } from "./conversation-registry.ts";
 import {
 	type ConversationRetentionOptions,

package/src/core/db/migrations.ts

@@ -1,6 +1,6 @@
 import { SQL, type TransactionSQL } from "bun";
-import { MigrationError, PluginError } from "../errors.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
+import { MigrationError, PluginError } from "../kernel/errors.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
 
 /** A plugin's tables, as DDL its `up` runs. */
 export interface Migration {

package/src/core/discord/agent-commands.ts

@@ -30,8 +30,8 @@ import {
 import { characterOf } from "../agents/agent-rules.ts";
 import { type Agent, MAX_PROMPT_CHARS } from "../agents/agent-store.ts";
 import { AgentError } from "../domain/errors.ts";
+import { THINKING_LEVELS, thinkingLabel } from "../domain/models.ts";
 import { messages } from "../i18n/index.ts";
-import { THINKING_LEVELS, thinkingLabel } from "../models.ts";
 import {
 	BUILTIN_SKILLS,
 	type SkillSet,
@@ -41,7 +41,7 @@ import type {
 	AgentTeam,
 	AvatarStudio,
 	SkillRegistry,
-} from "../services.ts";
+} from "../plugin-api/services.ts";
 import { OwnerFacingError, ownerPanel } from "./owner-panel.ts";
 
 /** The custom-id prefixes of the panel's buttons and forms; posted panels carry them, so they never change. */

package/src/core/discord/agent-discord.ts

@@ -27,7 +27,7 @@ import type {
 import { AgentError } from "../domain/errors.ts";
 import type { InterimPosts } from "../domain/interim.ts";
 import { messages } from "../i18n/index.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 import { type IntercomTexts, intercomPost } from "./intercom-cards.ts";
 
 const DASHBOARD_NAME = "dashboard";

package/src/core/discord/agent-panel.ts

@@ -1,5 +1,5 @@
 import { type Interaction, MessageFlags } from "discord.js";
-import type { AgentServer, SkillRegistry } from "../services.ts";
+import type { AgentServer, SkillRegistry } from "../plugin-api/services.ts";
 import {
 	AGENT_BUTTON_PREFIX,
 	AGENT_MODAL_PREFIX,

package/src/core/discord/card-audience.ts

@@ -1,6 +1,6 @@
 import { messages } from "../i18n/index.ts";
+import { type Tier, tierAtLeast } from "../identity/speakers.ts";
 import type { ApprovedBy, PromptScope } from "../interactions/prompts.ts";
-import { type Tier, tierAtLeast } from "../speakers.ts";
 import type {
 	DiscordOwners,
 	DiscordOwnersOptions,

package/src/core/discord/card-copies.ts

@@ -3,7 +3,7 @@ import { chmod, mkdir, rename, writeFile } from "node:fs/promises";
 import { dirname } from "node:path";
 import { AttachmentBuilder, MessageFlags } from "discord.js";
 import { messages } from "../i18n/index.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 
 /** The most characters of one card's copy text; a longer one gets no copy button. */
 export const COPY_TEXT_LIMIT = 20_000;

package/src/core/discord/channel-context.ts

@@ -12,7 +12,7 @@ import {
 import type { InboundMessage } from "../contract/channels.ts";
 import { parseChannelKey } from "../contract/surface.ts";
 import { MAX_TURN_IMAGES } from "../domain/attachment.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 import { contextImages, type SkippedImage } from "./context-images.ts";
 import { embedText } from "./embed-text.ts";
 import type { BotIdentity } from "./inbound-message.ts";

package/src/core/discord/channel-executor.ts

@@ -11,7 +11,7 @@ import {
 	type PermissionResolvable,
 	type TextChannel,
 } from "discord.js";
-import { freeze } from "../freeze.ts";
+import { freeze } from "../kernel/freeze.ts";
 import type { ChannelOperation } from "./channel-operations.ts";
 import {
 	type ChannelExecutor,

package/src/core/discord/channel-operations.ts

@@ -1,7 +1,7 @@
 import { type TSchema, Type } from "typebox";
 import Value from "typebox/value";
-import { freeze } from "../freeze.ts";
 import { type Messages, messages } from "../i18n/index.ts";
+import { freeze } from "../kernel/freeze.ts";
 
 /** What a call may do in one channel, with the owner-facing label; grants and permission checks name these. */
 export const CHANNEL_OPERATIONS = Object.freeze([

package/src/core/discord/command-collection.ts

@@ -1,4 +1,4 @@
-import { PluginError } from "../errors.ts";
+import { PluginError } from "../kernel/errors.ts";
 import { type ComposedCommands, composeCommands } from "./compose-commands.ts";
 import type {
 	CommandRegistrar,

package/src/core/discord/compose-commands.ts

@@ -2,7 +2,7 @@ import {
 	type RESTPostAPIChatInputApplicationCommandsJSONBody,
 	SlashCommandBuilder,
 } from "discord.js";
-import { PluginError } from "../errors.ts";
+import { PluginError } from "../kernel/errors.ts";
 import type {
 	CommandRoot,
 	InteractionContribution,

package/src/core/discord/context-images.ts

@@ -5,7 +5,7 @@ import {
 } from "../attachments/image-prep.ts";
 import type { ChannelContextAttachment } from "../contract/channel-context.ts";
 import type { ModelImage } from "../domain/attachment.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 
 /** Why an image of a channel message was not attached to the turn; fixed words, never an error's text. */
 export type SkippedReason =

package/src/core/discord/discord-owners.ts

@@ -1,6 +1,6 @@
 import type { IdentityService } from "../identity/identity-service.ts";
-import type { Logger } from "../log.ts";
-import { type Speaker, type Tier, tierAtLeast } from "../speakers.ts";
+import { type Speaker, type Tier, tierAtLeast } from "../identity/speakers.ts";
+import type { Logger } from "../kernel/log.ts";
 
 /** A Discord user who pressed or ran something; their roles are unknown where the interaction carries no member. */
 export interface DiscordUser {

package/src/core/discord/discord-surface.ts

@@ -25,11 +25,11 @@ import type {
 } from "../domain/conversation.ts";
 import type { InterimPosts } from "../domain/interim.ts";
 import type { OwnerNotifier } from "../domain/ports.ts";
-import type { MemberJoinedEvent } from "../event-types.ts";
 import { messages } from "../i18n/index.ts";
 import type { PromptScope, Prompts } from "../interactions/prompts.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 import type { OwnerOperations } from "../modules/discord-admin/discord-admin.ts";
+import type { MemberJoinedEvent } from "../plugin-api/event-types.ts";
 import { splitReply } from "../presentation/reply-splitter.ts";
 import { threadsOfHost } from "../threads/host-threads.ts";
 import { DiscordAgentChannels, DiscordDashboard } from "./agent-discord.ts";

package/src/core/discord/member-events.ts

@@ -1,6 +1,6 @@
 import { type Client, Events, GatewayIntentBits } from "discord.js";
-import type { MemberJoinedEvent } from "../event-types.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
+import type { MemberJoinedEvent } from "../plugin-api/event-types.ts";
 
 /** The privileged Server Members intent, asked for only when the host turns `discord.memberEvents` on. */
 export function memberIntents(

package/src/core/discord/message-changes.ts

@@ -2,7 +2,7 @@ import { type Client, Events } from "discord.js";
 import type { InboundMessage } from "../contract/channels.ts";
 import type { SurfaceMessageEvents } from "../contract/surface.ts";
 import { channelKey } from "../contract/surface.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 import { toInbound } from "./inbound-message.ts";
 
 /** Hands every message the client sees to `deliver` as the neutral message; the bot's own are left out. */

package/src/core/discord/owner-cards.ts

@@ -8,7 +8,7 @@ import type {
 	PromptScope,
 	Prompts,
 } from "../interactions/prompts.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 import { type CardAudienceOptions, CardAudiences } from "./card-audience.ts";
 import { CardCopies, copyReply, offeredCopy } from "./card-copies.ts";
 import { DiscordOwners, discordUser } from "./discord-owners.ts";

package/src/core/discord/owner-command.ts

@@ -8,7 +8,7 @@ import {
 } from "discord.js";
 import { messages } from "../i18n/index.ts";
 import type { IdentityService } from "../identity/identity-service.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 import {
 	type DiscordActor,
 	DiscordOwners,

package/src/core/discord/schedule-commands.ts

@@ -6,7 +6,7 @@ import type {
 import { messages } from "../i18n/index.ts";
 import { describeRecurrence } from "../modules/schedules/recurrence.ts";
 import type { Schedule } from "../modules/schedules/schedule-store.ts";
-import type { ScheduleStore } from "../services.ts";
+import type { ScheduleStore } from "../plugin-api/services.ts";
 import type {
 	CommandGuard,
 	InteractionContribution,

package/src/core/domain/conversation.ts

@@ -1,8 +1,10 @@
 import type { InboundMessage } from "../contract/channels.ts";
-import type { ChannelKey } from "../sessions.ts";
-import type { Tier } from "../speakers.ts";
+import type { Tier } from "../identity/speakers.ts";
+import type { ChannelKey } from "./sessions.ts";
 
-export { QUEUED_MARK, STEERED_MARK } from "../contract/channels.ts";
+/** Reactions on a message sent during a turn: added to that turn, or waiting for its own. */
+export const STEERED_MARK = "↪️";
+export const QUEUED_MARK = "⏳";
 export type { ChannelKey, InboundMessage };
 
 export interface TranscriptEntry {

package/src/core/{models.ts → domain/models.ts}

@@ -1,4 +1,4 @@
-import { messages } from "./i18n/index.ts";
+import { messages } from "../i18n/index.ts";
 import type { ChannelKey } from "./sessions.ts";
 /** Models and thinking levels as Pi names them, and the settings built on them. */
 

package/src/core/domain/ports.ts

@@ -1,10 +1,10 @@
-import type { AgentTurnScope, TurnSelection } from "../sessions.ts";
-import type { Speaker } from "../speakers.ts";
+import type { Speaker } from "../identity/speakers.ts";
 import type { TurnAttachments } from "./attachment.ts";
 import type { ClientPort } from "./client.ts";
 import type { ChannelKey } from "./conversation.ts";
 import type { InterimPosts } from "./interim.ts";
 import type { TurnProgress } from "./progress.ts";
+import type { AgentTurnScope, TurnSelection } from "./sessions.ts";
 
 export type { AgentTurnScope };
 

package/src/core/{sessions.ts → domain/sessions.ts}

@@ -1,10 +1,10 @@
 import type { ExtensionFactory } from "@earendil-works/pi-coding-agent";
-import type { ClientPort } from "./domain/client.ts";
-import { PluginError } from "./errors.ts";
-import type { Principal } from "./identity/principal-store.ts";
-import type { OwnerIdentity } from "./identity.ts";
-import type { ApprovedBy } from "./interactions/prompts.ts";
-import type { Speaker } from "./speakers.ts";
+import type { OwnerIdentity } from "../identity/owner-identity.ts";
+import type { Principal } from "../identity/principal-store.ts";
+import type { Speaker } from "../identity/speakers.ts";
+import type { ApprovedBy } from "../interactions/prompts.ts";
+import { PluginError } from "../kernel/errors.ts";
+import type { ClientPort } from "./client.ts";
 
 /** `<surface>:<channel id>`, for example `discord:1234`. A DM is one channel. */
 export type ChannelKey = `${string}:${string}`;

package/src/core/{define-roundtable.ts → host/define-roundtable.ts}

@@ -2,51 +2,51 @@ import { readFileSync } from "node:fs";
 import { userInfo } from "node:os";
 import { join } from "node:path";
 import { ModelRegistry, ModelRuntime } from "@earendil-works/pi-coding-agent";
-import { agentServerPlugin, LOCAL_TEAM_ID } from "./builtin/agent-server.ts";
-import { channelContextPlugin } from "./builtin/channel-context.ts";
-import { discordPlugin } from "./builtin/discord.ts";
-import { discordAdminPlugin } from "./builtin/discord-admin.ts";
-import { modulesPlugin, schedulerPlugin } from "./builtin/modules.ts";
-import { promptsPlugin } from "./builtin/prompts.ts";
-import { seedsPlugin } from "./builtin/seeds.ts";
-import { skillsPlugin } from "./builtin/skills.ts";
+import { agentServerPlugin, LOCAL_TEAM_ID } from "../builtin/agent-server.ts";
+import { channelContextPlugin } from "../builtin/channel-context.ts";
+import { discordPlugin } from "../builtin/discord.ts";
+import { discordAdminPlugin } from "../builtin/discord-admin.ts";
+import { identityPlugin } from "../builtin/identity.ts";
+import { modulesPlugin, schedulerPlugin } from "../builtin/modules.ts";
+import { promptsPlugin } from "../builtin/prompts.ts";
+import { seedsPlugin } from "../builtin/seeds.ts";
+import { skillsPlugin } from "../builtin/skills.ts";
 import {
 	memoryPlugin,
 	precheckPlugin,
 	scheduleStorePlugin,
-} from "./builtin/stores.ts";
-import { threadsPlugin } from "./builtin/threads.ts";
-import { workerSessionsPlugin } from "./builtin/worker-sessions.ts";
-import { warnDeprecations } from "./config/access.ts";
+} from "../builtin/stores.ts";
+import { threadsPlugin } from "../builtin/threads.ts";
+import { workerSessionsPlugin } from "../builtin/worker-sessions.ts";
+import { warnDeprecations } from "../config/access.ts";
 import {
 	type ResolvedConfig,
 	type RoundtableConfig,
 	resolveConfig,
-} from "./config/config.ts";
-import { conversationsPlugin } from "./conversations/conversations-plugin.ts";
-import { ConfigError } from "./domain/errors.ts";
-import { JudgeError } from "./errors.ts";
-import type { RoundtableOptions } from "./host.ts";
-import type { ListenerConfig } from "./http/listeners.ts";
-import { identityPlugin } from "./identity/identity-plugin.ts";
-import { type JudgeModel, piJudgeModel } from "./judging/model-judge.ts";
-import { createLogger, type LogEntry, type Logger } from "./log.ts";
-import { formatModelRef, type ModelRef } from "./models.ts";
-import { modesPlugin } from "./modes/modes-plugin.ts";
-import { ErrorReporter } from "./ops/error-reporter.ts";
-import type { RoundtablePlugin } from "./plugin.ts";
+} from "../config/config.ts";
+import { conversationsPlugin } from "../conversations/conversations-plugin.ts";
+import { ConfigError } from "../domain/errors.ts";
+import { formatModelRef, type ModelRef } from "../domain/models.ts";
+import type { ListenerConfig } from "../http/listeners.ts";
+import { type JudgeModel, piJudgeModel } from "../judging/model-judge.ts";
+import { JudgeError } from "../kernel/errors.ts";
+import { createLogger, type LogEntry, type Logger } from "../kernel/log.ts";
+import { modesPlugin } from "../modes/modes-plugin.ts";
+import { ErrorReporter } from "../ops/error-reporter.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
 import {
 	BRIDGE_MEMORY_FIX,
 	bridgeMemoryProblem,
 	configuredCrowd,
 	onClaudeBridge,
-} from "./runtime/bridge-guard.ts";
+} from "../runtime/bridge-guard.ts";
 import {
 	type AgentSessionsSlot,
 	agentSessionsSlot,
 	runtimePlugin,
-} from "./runtime/runtime-plugin.ts";
-import { toolTiers } from "./tool-tiers.ts";
+} from "../runtime/runtime-plugin.ts";
+import { toolTiers } from "../runtime/tool-tiers.ts";
+import type { RoundtableOptions } from "./host.ts";
 
 /** What `defineRoundtable` returns: give both to `new Roundtable(options, plugins)`. */
 export interface DefinedRoundtable {
@@ -75,7 +75,7 @@ export interface DefineOverrides {
 	aborted?: (left: string[]) => Promise<void>;
 }
 
-const ASSETS = join(import.meta.dir, "assets");
+const ASSETS = join(import.meta.dir, "../assets");
 
 function readPrompt(path: string, key: string): string {
 	let text: string;

package/src/core/{drain.ts → host/drain.ts}

@@ -1,10 +1,5 @@
-import type { Logger } from "./log.ts";
-
-/**
- * How long a shutdown waits for running work before aborting it: long enough for a usual turn to
- * answer, short enough that a hung one never holds a restart for an hour.
- */
-export const DRAIN_LIMIT_MS = 3 * 60_000;
+import { DRAIN_LIMIT_MS } from "../config/config-schema.ts";
+import type { Logger } from "../kernel/log.ts";
 
 /** How long work that was told to stop gets to end before the shutdown goes on without it. */
 const ABORT_GRACE_MS = 10_000;

package/src/core/{events.ts → host/events.ts}

@@ -1,5 +1,5 @@
-import type { Logger } from "./log.ts";
-import type { EventHandlers, EventSink } from "./plugin.ts";
+import type { Logger } from "../kernel/log.ts";
+import type { EventHandlers, EventSink } from "../plugin-api/plugin.ts";
 
 /** One registered plugin's handlers. */
 interface Registered {

package/src/core/{host-background.ts → host/host-background.ts}

@@ -1,6 +1,6 @@
-import type { Logger } from "./log.ts";
-import type { ServiceStartedEvent } from "./plugin.ts";
-import type { Registry } from "./registry/contributions.ts";
+import type { Logger } from "../kernel/log.ts";
+import type { ServiceStartedEvent } from "../plugin-api/plugin.ts";
+import type { Registry } from "../registry/contributions.ts";
 
 type Attempt = { ok: true } | { ok: false; error: unknown };
 

package/src/core/{host-registration.ts → host/host-registration.ts}

@@ -4,49 +4,49 @@ import {
 	CharacterError,
 	checkSkins,
 	type Hex,
-} from "../characters/index.ts";
-import { attachmentPort } from "./attachments/attachment-port.ts";
-import { retentionServices } from "./attachments/attachment-retention.ts";
-import type { AttachmentPort } from "./contract/attachments.ts";
-import type { ConversationPort } from "./contract/channels.ts";
-import type { ResolvedProviders } from "./contract/providers.ts";
-import type { SurfacePort } from "./contract/surface.ts";
-import { ConfigError } from "./domain/errors.ts";
-import { NotLinkedError } from "./errors.ts";
-import { EventBus } from "./events.ts";
-import type { RoundtableOptions } from "./host.ts";
-import { HttpListeners, listenerAddress } from "./http/listeners.ts";
-import { setLocale } from "./i18n/index.ts";
-import { contactsOf } from "./identity/identity-view.ts";
+} from "../../characters/index.ts";
+import { attachmentPort } from "../attachments/attachment-port.ts";
+import { retentionServices } from "../attachments/attachment-retention.ts";
+import type { AttachmentPort } from "../contract/attachments.ts";
+import type { ConversationPort } from "../contract/channels.ts";
+import type { ResolvedProviders } from "../contract/providers.ts";
+import type { SurfacePort } from "../contract/surface.ts";
+import { ConfigError } from "../domain/errors.ts";
+import { HttpListeners, listenerAddress } from "../http/listeners.ts";
+import { setLocale } from "../i18n/index.ts";
+import { contactsOf } from "../identity/identity-view.ts";
+import { NotLinkedError } from "../kernel/errors.ts";
+import { setTimeZone } from "../kernel/time.ts";
 import type {
 	HostEnv,
 	LinkedSessions,
 	RoundtablePlugin,
 	Service,
-} from "./plugin.ts";
-import { refuseRemovedFields } from "./plugin.ts";
+} from "../plugin-api/plugin.ts";
+import { refuseRemovedFields } from "../plugin-api/plugin.ts";
+import { CONVERSATIONS, IDENTITY, RUNTIME } from "../plugin-api/services.ts";
 import {
 	collectContributions,
 	emptyRegistry,
 	linkSessions,
 	type Registry,
-} from "./registry/contributions.ts";
-import { resolveProviders } from "./registry/providers.ts";
-import { replaceServices, ServiceRegistry } from "./registry/services.ts";
-import { ChannelQueue } from "./routing/channel-queue.ts";
-import { ChannelRouter } from "./routing/channel-router.ts";
+} from "../registry/contributions.ts";
+import { resolveProviders } from "../registry/providers.ts";
+import { replaceServices, ServiceRegistry } from "../registry/services.ts";
+import { ChannelQueue } from "../routing/channel-queue.ts";
+import { ChannelRouter } from "../routing/channel-router.ts";
 import {
 	type ConversationTurns,
 	conversationTurns,
-} from "./routing/conversation-turns.ts";
-import { MessageObservers } from "./routing/message-observers.ts";
-import { PeerBots } from "./routing/peer-bots.ts";
-import { surfacePort } from "./routing/surface-port.ts";
-import { refuseHostAccess } from "./runtime/chat-only.ts";
-import { CONVERSATIONS, IDENTITY, RUNTIME } from "./services.ts";
-import { frozenShellEnv } from "./shared/child-env.ts";
-import { setTimeZone } from "./time.ts";
-import { type ToolTierTable, toolTiers } from "./tool-tiers.ts";
+} from "../routing/conversation-turns.ts";
+import { MessageObservers } from "../routing/message-observers.ts";
+import { PeerBots } from "../routing/peer-bots.ts";
+import { surfacePort } from "../routing/surface-port.ts";
+import { refuseHostAccess } from "../runtime/chat-only.ts";
+import { type ToolTierTable, toolTiers } from "../runtime/tool-tiers.ts";
+import { frozenShellEnv } from "../shared/child-env.ts";
+import { EventBus } from "./events.ts";
+import type { RoundtableOptions } from "./host.ts";
 
 /** The skin tones the host's environment names, checked, or the package's own; a bad set refuses the start. */
 function characterSkinsOf(skins: readonly Hex[] | undefined): readonly Hex[] {

package/src/core/{host.ts → host/host.ts}

@@ -1,22 +1,26 @@
 import type { SQL } from "bun";
-import type { Hex } from "../characters/index.ts";
-import type { AttachmentRetention } from "./attachments/attachment-retention.ts";
-import { checkDatabase } from "./db/check-database.ts";
-import { openPool, runMigrations } from "./db/migrations.ts";
+import type { Hex } from "../../characters/index.ts";
+import type { AttachmentRetention } from "../attachments/attachment-retention.ts";
+import type { PeerBotsConfig } from "../config/peer-bots.ts";
+import { checkDatabase } from "../db/check-database.ts";
+import { openPool, runMigrations } from "../db/migrations.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
+import type { HttpListeners, ListenerConfig } from "../http/listeners.ts";
+import type { Locale } from "../i18n/index.ts";
+import type { JudgeModel } from "../judging/model-judge.ts";
+import { MigrationError, PluginError } from "../kernel/errors.ts";
+import type { Logger } from "../kernel/log.ts";
+import type {
+	AgentTools,
+	RoundtablePlugin,
+	Service,
+} from "../plugin-api/plugin.ts";
+import { RUNTIME } from "../plugin-api/services.ts";
+import type { ToolTierTable } from "../runtime/tool-tiers.ts";
+import type { ShellEnvConfig } from "../shared/child-env.ts";
 import { type DrainOptions, drainWork, stopTurns } from "./drain.ts";
-import { MigrationError, PluginError } from "./errors.ts";
 import { attempt, startInBackground } from "./host-background.ts";
 import { Linkage, type RegistrationReport } from "./host-registration.ts";
-import type { HttpListeners, ListenerConfig } from "./http/listeners.ts";
-import type { Locale } from "./i18n/index.ts";
-import type { JudgeModel } from "./judging/model-judge.ts";
-import type { Logger } from "./log.ts";
-import type { AgentTools, RoundtablePlugin, Service } from "./plugin.ts";
-import type { PeerBotsConfig } from "./routing/peer-bots.ts";
-import { RUNTIME } from "./services.ts";
-import type { ChannelKey } from "./sessions.ts";
-import type { ShellEnvConfig } from "./shared/child-env.ts";
-import type { ToolTierTable } from "./tool-tiers.ts";
 
 /**
  * What differs between hosts: the words and time the process speaks in, and the Pi agent

package/src/core/http/listeners.ts

@@ -1,7 +1,7 @@
 import { chmodSync } from "node:fs";
 import type { Server, WebSocketHandler } from "bun";
-import { PluginError } from "../errors.ts";
-import type { Logger } from "../log.ts";
+import { PluginError } from "../kernel/errors.ts";
+import type { Logger } from "../kernel/log.ts";
 import { serveUnix } from "../shared/unix-server.ts";
 import {
 	type Connection,

package/src/core/http/websocket.ts

@@ -1,5 +1,5 @@
 import type { Server, ServerWebSocket, WebSocketHandler } from "bun";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 
 /**
  * What became of one `send`: written to the connection, `"queued"` behind a client that reads

package/src/core/identity/access-policy.ts

@@ -1,13 +1,6 @@
 import type { Pronouns } from "../config/config.ts";
 import { ConfigError } from "../domain/errors.ts";
-import type { ChannelKey } from "../sessions.ts";
-import type {
-	SpeakerFacts,
-	SpeakerMap,
-	SpeakerPolicy,
-	Tier,
-	TierMembers,
-} from "../speakers.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
 import {
 	type ActorFacts,
 	identityOf,
@@ -15,6 +8,13 @@ import {
 	surfaceOf,
 } from "./actor-facts.ts";
 import { SYSTEM_PRINCIPAL } from "./principal-store.ts";
+import type {
+	SpeakerFacts,
+	SpeakerMap,
+	SpeakerPolicy,
+	Tier,
+	TierMembers,
+} from "./speakers.ts";
 
 /** One owner the configuration names: whom they are, and the identities that are theirs. */
 export interface AccessOwner {

package/src/core/identity/actor-facts.ts

@@ -1,5 +1,5 @@
 import { parseChannelKey } from "../contract/surface.ts";
-import type { ChannelKey } from "../sessions.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
 import type { IdentityRef } from "./principal-store.ts";
 
 /**