pi-roundtable 0.33.0 → 0.35.0

package/src/core/agents/message-target.ts

@@ -1,6 +1,6 @@
 import type { ChannelKey } from "../domain/conversation.ts";
 import { AgentError } from "../domain/errors.ts";
-import type { AgentDirectory } from "../services.ts";
+import type { AgentDirectory } from "../plugin-api/services.ts";
 import type { Agent } from "./agent-store.ts";
 import { Routes } from "./routes.ts";
 import { agentRoomKey, keysOf } from "./team-keys.ts";

package/src/core/agents/routes.ts

@@ -6,7 +6,7 @@ import { ROUTE_WORDS } from "../config/routing.ts";
 import { parseChannelKey } from "../contract/surface.ts";
 import type { ChannelKey } from "../domain/conversation.ts";
 import { AgentError, ConfigError } from "../domain/errors.ts";
-import type { AgentDirectory } from "../services.ts";
+import type { AgentDirectory } from "../plugin-api/services.ts";
 import {
 	agentRoomKey,
 	discordKey,

package/src/core/agents/team-approval.ts

@@ -1,7 +1,7 @@
 import type { PendingConfirmation } from "../domain/conversation.ts";
+import { type Speaker, tierAtLeast } from "../identity/speakers.ts";
 import { mayApproveNamed } from "../runtime/extensions/held-calls.ts";
-import { type Speaker, tierAtLeast } from "../speakers.ts";
-import type { ToolTiers } from "../tool-tiers.ts";
+import type { ToolTiers } from "../runtime/tool-tiers.ts";
 
 /**
  * Whether the speaker may approve the held actions by a message, call by call: an owner, as the

package/src/core/agents/team-editing.ts

@@ -9,9 +9,9 @@ import { parseChannelKey } from "../contract/surface.ts";
 import { AgentError } from "../domain/errors.ts";
 import type { AgentTurnScope } from "../domain/ports.ts";
 import { SYSTEM_PRINCIPAL } from "../identity/principal-store.ts";
+import { addressee, type Speaker } from "../identity/speakers.ts";
 import type { ConversationModes } from "../modes/conversation-modes.ts";
-import type { AgentChange } from "../services.ts";
-import { addressee, type Speaker } from "../speakers.ts";
+import type { AgentChange } from "../plugin-api/services.ts";
 import { openingTaskText } from "./agent-prompt.ts";
 import { characterOf, overBase } from "./agent-rules.ts";
 import { modelSetting, thinkingSetting } from "./agent-settings.ts";

package/src/core/agents/team-keys.ts

@@ -2,7 +2,7 @@ import { channelKey, parseChannelKey } from "../contract/surface.ts";
 import type { ChannelKey } from "../domain/conversation.ts";
 import { AgentError } from "../domain/errors.ts";
 import type { AgentTurnScope } from "../domain/ports.ts";
-import type { AgentDirectory } from "../services.ts";
+import type { AgentDirectory } from "../plugin-api/services.ts";
 import type { Agent, AgentGroup } from "./agent-store.ts";
 
 /** The surface of the channels the agent server runs on. */

package/src/core/agents/team-layout.ts

@@ -1,6 +1,6 @@
 import { AgentError } from "../domain/errors.ts";
 import { messages } from "../i18n/index.ts";
-import type { AgentDirectory } from "../services.ts";
+import type { AgentDirectory } from "../plugin-api/services.ts";
 import type { CategoryLayout } from "./agent-ports.ts";
 import type { AgentGroup } from "./agent-store.ts";
 

package/src/core/agents/team-options.ts

@@ -1,10 +1,10 @@
 import type { ResolvedHelpers } from "../config/helpers.ts";
 import type { ChannelKey } from "../domain/conversation.ts";
-import type { ThinkingSetting } from "../models.ts";
+import type { ThinkingSetting } from "../domain/models.ts";
+import type { ToolSelection } from "../domain/sessions.ts";
 import type { ConversationModes } from "../modes/conversation-modes.ts";
-import type { AgentTools, PromptSection } from "../plugin.ts";
-import type { AvatarStudio, SkillRegistry } from "../services.ts";
-import type { ToolSelection } from "../sessions.ts";
+import type { AgentTools, PromptSection } from "../plugin-api/plugin.ts";
+import type { AvatarStudio, SkillRegistry } from "../plugin-api/services.ts";
 import type { AgentChannels, AgentModels } from "./agent-ports.ts";
 import type { AgentGroup, AgentSeed } from "./agent-store.ts";
 import type { TeamTurns, TeamTurnsOptions } from "./team-turns.ts";

package/src/core/agents/team-selection.ts

@@ -1,6 +1,6 @@
 import type { AgentTurnScope } from "../domain/ports.ts";
+import type { TurnSelection } from "../domain/sessions.ts";
 import { SHELL_TOOLS } from "../modules/host-shell/shell-policy.ts";
-import type { TurnSelection } from "../sessions.ts";
 import { isHelper } from "./agent-rules.ts";
 import {
 	AGENT_TOOLS,

package/src/core/agents/team-status.ts

@@ -1,4 +1,4 @@
-import type { ThinkingSetting } from "../models.ts";
+import type { ThinkingSetting } from "../domain/models.ts";
 import type { ContextUse } from "./agent-ports.ts";
 import { discordIdOf, keysOf } from "./team-keys.ts";
 import type { TeamContext } from "./team-options.ts";

package/src/core/agents/team-text.ts

@@ -1,9 +1,9 @@
 import { CATALOG, type CharacterSpec } from "../../characters/index.ts";
 import { AgentError } from "../domain/errors.ts";
+import type { ThinkingSetting } from "../domain/models.ts";
 import { assistantName } from "../i18n/index.ts";
-import type { ThinkingSetting } from "../models.ts";
-import type { AgentDirectory } from "../services.ts";
-import { zonedStamp } from "../time.ts";
+import { zonedStamp } from "../kernel/time.ts";
+import type { AgentDirectory } from "../plugin-api/services.ts";
 import type { ChannelMessage } from "./agent-ports.ts";
 import { characterOf, isHelper } from "./agent-rules.ts";
 import { describeThinking } from "./agent-settings.ts";

package/src/core/agents/team-turn-types.ts

@@ -8,14 +8,14 @@ import type {
 	TurnResult,
 } from "../domain/conversation.ts";
 import type { AgentTurnScope } from "../domain/ports.ts";
+import type { TurnSelection } from "../domain/sessions.ts";
 import type { IdentityService } from "../identity/identity-port.ts";
-import type { OwnerIdentity } from "../identity.ts";
-import type { Logger } from "../log.ts";
-import type { EventSink } from "../plugin.ts";
-import type { AvatarStudio } from "../services.ts";
-import type { TurnSelection } from "../sessions.ts";
-import type { Speaker } from "../speakers.ts";
-import type { ToolTiers } from "../tool-tiers.ts";
+import type { OwnerIdentity } from "../identity/owner-identity.ts";
+import type { Speaker } from "../identity/speakers.ts";
+import type { Logger } from "../kernel/log.ts";
+import type { EventSink } from "../plugin-api/plugin.ts";
+import type { AvatarStudio } from "../plugin-api/services.ts";
+import type { ToolTiers } from "../runtime/tool-tiers.ts";
 import type { AgentChannels, AgentTurnRunner } from "./agent-ports.ts";
 import type { Agent, PgAgentStore } from "./agent-store.ts";
 import type { RelevanceScorer } from "./group-round.ts";

package/src/core/agents/team-turns.ts

@@ -12,12 +12,12 @@ import { AgentError } from "../domain/errors.ts";
 import type { InterimPosts } from "../domain/interim.ts";
 import type { AgentTurnScope } from "../domain/ports.ts";
 import type { TurnProgress } from "../domain/progress.ts";
+import type { Speaker } from "../identity/speakers.ts";
 import { isQuiet, replyBody } from "../presentation/reply-body.ts";
 import { splitReply } from "../presentation/reply-splitter.ts";
-import { withReplyFiles } from "../reply-files.ts";
 import { endOf, settleTurn } from "../routing/settle-turn.ts";
-import type { Speaker } from "../speakers.ts";
-import { toolTiers } from "../tool-tiers.ts";
+import { toolTiers } from "../runtime/tool-tiers.ts";
+import { withReplyFiles } from "../shared/reply-files.ts";
 import { AgentMessages } from "./agent-messages.ts";
 import type { Agent } from "./agent-store.ts";
 import { GroupTurns } from "./group-turns.ts";

package/src/core/attachments/attachment-fetcher.ts

@@ -7,7 +7,7 @@ import type {
 	AttachmentRef,
 	StoredAttachment,
 } from "../domain/attachment.ts";
-import { PluginError } from "../errors.ts";
+import { PluginError } from "../kernel/errors.ts";
 import { plainText } from "./attachment-name.ts";
 
 export const MAX_ATTACHMENT_BYTES = 25 * 1024 * 1024;

package/src/core/attachments/attachment-port.ts

@@ -1,6 +1,6 @@
 import type { AttachmentPort } from "../contract/attachments.ts";
-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 {
 	AttachmentStore,
 	type AttachmentStoreOptions,

package/src/core/attachments/attachment-retention.ts

@@ -1,7 +1,7 @@
 import type { AttachmentPort } from "../contract/attachments.ts";
-import { PluginError } from "../errors.ts";
-import type { Logger } from "../log.ts";
-import type { Service } from "../plugin.ts";
+import { PluginError } from "../kernel/errors.ts";
+import type { Logger } from "../kernel/log.ts";
+import type { Service } from "../plugin-api/plugin.ts";
 
 /** How long used files are kept, and how often the host looks for the ones past it. */
 export interface AttachmentRetention {

package/src/core/attachments/attachment-store.ts

@@ -14,8 +14,8 @@ import type {
 	StoredAttachment,
 	TurnAttachments,
 } from "../domain/attachment.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";
 import {
 	channelSegment,
 	listDir,

package/src/core/attachments/model-images.ts

@@ -3,7 +3,7 @@ import type {
 	ModelImage,
 	StoredAttachment,
 } from "../domain/attachment.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 import {
 	isModelImage,
 	MAX_IMAGES_PER_TURN,

package/src/core/attachments/turn-attachments.ts

@@ -1,7 +1,7 @@
 import type { AttachmentContent } from "../contract/channels.ts";
 import type { AttachmentRef, TurnAttachments } from "../domain/attachment.ts";
 import type { InboundMessage } from "../domain/conversation.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 import { fetchAttachments } from "./attachment-fetcher.ts";
 import { modelImagesOf } from "./model-images.ts";
 

package/src/core/builtin/agent-server.ts

@@ -18,15 +18,18 @@ import type { ResolvedRouting } from "../config/routing.ts";
 import type { AgentSessions } from "../contract/runtime.ts";
 import type { ChannelKey } from "../domain/conversation.ts";
 import { ConfigError } from "../domain/errors.ts";
-import type { OwnerIdentity } from "../identity.ts";
+import {
+	AUTO_THINKING,
+	formatModelRef,
+	type ModelRef,
+} from "../domain/models.ts";
+import type { SessionTool } from "../domain/sessions.ts";
+import type { OwnerIdentity } from "../identity/owner-identity.ts";
+import type { Tier } from "../identity/speakers.ts";
 import { ConfirmationJudge } from "../judging/confirmation-judge.ts";
-import type { Logger } from "../log.ts";
-import { AUTO_THINKING, formatModelRef, type ModelRef } from "../models.ts";
+import type { Logger } from "../kernel/log.ts";
 import type { ErrorReporter } from "../ops/error-reporter.ts";
-import type { PluginContext, RoundtablePlugin } from "../plugin.ts";
-import { splitReply } from "../presentation/reply-splitter.ts";
-import { agentPromptExtension } from "../runtime/extensions/agent-prompt.ts";
-import type { AgentSessionsSlot } from "../runtime/runtime-plugin.ts";
+import type { PluginContext, RoundtablePlugin } from "../plugin-api/plugin.ts";
 import {
 	AGENTS,
 	BACKGROUND_TURNS,
@@ -36,9 +39,10 @@ import {
 	RUNTIME,
 	SCHEDULES,
 	SKILLS,
-} from "../services.ts";
-import type { SessionTool } from "../sessions.ts";
-import type { Tier } from "../speakers.ts";
+} from "../plugin-api/services.ts";
+import { splitReply } from "../presentation/reply-splitter.ts";
+import { agentPromptExtension } from "../runtime/extensions/agent-prompt.ts";
+import type { AgentSessionsSlot } from "../runtime/runtime-plugin.ts";
 import { DISCORD } from "./discord.ts";
 import { agentOnly } from "./session-tool.ts";
 
@@ -157,6 +161,9 @@ const AGENT_TIERS: Readonly<Record<string, Tier>> = {
 	// A knight may make temp knights for whoever is talking to it; the limits hold the cost.
 	helper_create: "member",
 	helper_end: "member",
+	helper_preset_set: "member",
+	helper_preset_list: "member",
+	helper_preset_delete: "member",
 };
 
 /** The tables the agent server keeps: its agents and groups. */

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

@@ -1,5 +1,5 @@
-import type { RoundtablePlugin } from "../plugin.ts";
-import { CHANNEL_CONTEXT } from "../services.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
+import { CHANNEL_CONTEXT } from "../plugin-api/services.ts";
 
 /**
  * The channel context of every surface that reads it. The plugin provides one `CHANNEL_CONTEXT`

package/src/core/builtin/discord-admin.ts

@@ -1,9 +1,9 @@
-import type { OwnerIdentity } from "../identity.ts";
+import type { OwnerIdentity } from "../identity/owner-identity.ts";
 import {
 	DISCORD_ADMIN_TOOLS,
 	discordAdminExtension,
 } from "../modules/discord-admin/discord-admin.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
 import { DISCORD } from "./discord.ts";
 import { fixed } from "./session-tool.ts";
 

package/src/core/builtin/discord.ts

@@ -1,5 +1,6 @@
 import { rmSync } from "node:fs";
 import { join } from "node:path";
+import type { PeerBotsConfig } from "../config/peer-bots.ts";
 import type {
 	ChannelContext,
 	ChannelContextOptions,
@@ -23,9 +24,9 @@ import type { DiscordPoster } from "../discord/poster/poster.ts";
 import { restOf, restPoster } from "../discord/poster/rest-poster.ts";
 import { stopButtonModule } from "../discord/stop-button.ts";
 import type { InboundMessage } from "../domain/conversation.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
-import { PeerBots, type PeerBotsConfig } from "../routing/peer-bots.ts";
-import { IDENTITY, THREADS } from "../services.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
+import { IDENTITY, THREADS } from "../plugin-api/services.ts";
+import { PeerBots } from "../routing/peer-bots.ts";
 import type { DispatchThreads } from "../threads/dispatch-threads.ts";
 
 /** The Discord connection and what stands on it, as plugins use it. Provided by the Discord plugin. */

package/src/core/{identity/identity-plugin.ts → builtin/identity.ts}

@@ -1,16 +1,19 @@
 import { isCheckDatabase } from "../db/check-database.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
-import { IDENTITY, IDENTITY_LINKS, PROFILES } from "../services.ts";
-import type { AccessRules } from "./access-policy.ts";
-import { identityLinks } from "./identity-links.ts";
-import { type BackfillSummary, identityMigrations } from "./identity-schema.ts";
-import { PgIdentityService } from "./identity-service.ts";
-import { identityView } from "./identity-view.ts";
-import { PersonDirectory } from "./person-profiles.ts";
-import { declaredIdentities } from "./plugin-identities.ts";
-import { PgPrincipalStore } from "./principal-store.ts";
-import type { ProfileRules } from "./profiles.ts";
-import { profilesView } from "./profiles-view.ts";
+import type { AccessRules } from "../identity/access-policy.ts";
+import { identityLinks } from "../identity/identity-links.ts";
+import {
+	type BackfillSummary,
+	identityMigrations,
+} from "../identity/identity-schema.ts";
+import { PgIdentityService } from "../identity/identity-service.ts";
+import { identityView } from "../identity/identity-view.ts";
+import { PersonDirectory } from "../identity/person-profiles.ts";
+import { declaredIdentities } from "../identity/plugin-identities.ts";
+import { PgPrincipalStore } from "../identity/principal-store.ts";
+import type { ProfileRules } from "../identity/profiles.ts";
+import { profilesView } from "../identity/profiles-view.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
+import { IDENTITY, IDENTITY_LINKS, PROFILES } from "../plugin-api/services.ts";
 
 /** The name of the identity plugin, as the migration ledger names it. */
 export const IDENTITY_PLUGIN = "identity";

package/src/core/builtin/modules.ts

@@ -10,15 +10,13 @@ import {
 	DelegationError,
 	ScheduleError,
 } from "../domain/errors.ts";
+import type { ModelRef, ThinkingLevel } from "../domain/models.ts";
+import type { SessionContext } from "../domain/sessions.ts";
 import { messages } from "../i18n/index.ts";
 import { legacyPrincipalsOf } from "../identity/identity-view.ts";
-import type { OwnerIdentity } from "../identity.ts";
-import type { ModelRef, ThinkingLevel } from "../models.ts";
+import type { OwnerIdentity } from "../identity/owner-identity.ts";
+import type { Tier } from "../identity/speakers.ts";
 import { ConversationBackgroundTurns } from "../modules/background/background-turns.ts";
-import {
-	type PerPrincipalLimits,
-	personalTarget,
-} from "../modules/background/personal-target.ts";
 import { delegateExtension } from "../modules/delegation/delegate.ts";
 import {
 	DefaultDelegator,
@@ -30,9 +28,7 @@ import { precheckScriptHoldRule } from "../modules/schedules/precheck-tools.ts";
 import { Scheduler } from "../modules/schedules/scheduler.ts";
 import { schedulesExtension } from "../modules/schedules/schedules.ts";
 import type { ErrorReporter } from "../ops/error-reporter.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
-import { runChannelFor } from "../presence/delivery-router.ts";
-import { splitReply } from "../presentation/reply-splitter.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
 import {
 	AGENTS,
 	BACKGROUND_TURNS,
@@ -41,11 +37,15 @@ import {
 	PRECHECKS,
 	SCHEDULES,
 	THREADS,
-} from "../services.ts";
-import type { SessionContext } from "../sessions.ts";
+} from "../plugin-api/services.ts";
+import { runChannelFor } from "../presence/delivery-router.ts";
+import { splitReply } from "../presentation/reply-splitter.ts";
 import { DELEGATE_TOOL } from "../shared/delegate-tool.ts";
+import {
+	type PerPrincipalLimits,
+	personalTarget,
+} from "../shared/personal-target.ts";
 import { SCHEDULE_TOOLS } from "../shared/schedule-tools.ts";
-import type { Tier } from "../speakers.ts";
 import { DISCORD } from "./discord.ts";
 import { fixed } from "./session-tool.ts";
 

package/src/core/builtin/prompts.ts

@@ -1,8 +1,8 @@
 import type { SQL } from "bun";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 import { PgPromptDocuments } from "../modules/prompts/prompt-documents.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
-import { PROMPTS } from "../services.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
+import { PROMPTS } from "../plugin-api/services.ts";
 
 export interface PromptsOptions {
 	/** The guild whose overrides the documents keep, or the local team's id. */

package/src/core/builtin/seeds.ts

@@ -1,5 +1,5 @@
 import type { AgentSeed } from "../agents/agent-rules.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
 
 /** The configured first team, created on the first start; an agent already stored is never overwritten. */
 export function seedsPlugin(agents: readonly AgentSeed[]): RoundtablePlugin {

package/src/core/builtin/session-tool.ts

@@ -3,7 +3,7 @@ import type {
 	AgentTurnScope,
 	SessionTool,
 	SessionToolSnapshot,
-} from "../sessions.ts";
+} from "../domain/sessions.ts";
 
 /** A session tool whose extension never changes. */
 export function fixed(

package/src/core/builtin/skills.ts

@@ -1,4 +1,5 @@
 import type { SQL } from "bun";
+import type { Tier } from "../identity/speakers.ts";
 import { discoverPackageSkills } from "../modules/skills/package-skills.ts";
 import { StoredSkillRegistry } from "../modules/skills/skill-registry.ts";
 import { SkillStore } from "../modules/skills/skill-store.ts";
@@ -8,9 +9,8 @@ import {
 	skillListExtension,
 	skillToolsExtension,
 } from "../modules/skills/skill-tools.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
-import { AGENTS, SKILLS } from "../services.ts";
-import type { Tier } from "../speakers.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
+import { AGENTS, SKILLS } from "../plugin-api/services.ts";
 import { agentOnly } from "./session-tool.ts";
 
 export interface SkillsOptions {

package/src/core/builtin/stores.ts

@@ -1,13 +1,18 @@
-import type { OwnerIdentity } from "../identity.ts";
+import type { SessionContext, SessionTool } from "../domain/sessions.ts";
+import type { OwnerIdentity } from "../identity/owner-identity.ts";
+import type { Tier } from "../identity/speakers.ts";
 import { ownerMemoryExtension } from "../modules/memory/owner-memory.ts";
 import { PgMemoryStore } from "../modules/memory/owner-memory-store.ts";
 import { memoryPrecheckRegistry } from "../modules/schedules/prechecks.ts";
 import { PgScheduleStore } from "../modules/schedules/schedule-store.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
+import {
+	MEMORY,
+	type MemoryStore,
+	PRECHECKS,
+	SCHEDULES,
+} from "../plugin-api/services.ts";
 import { memoryReader } from "../runtime/session-conversation.ts";
-import { MEMORY, type MemoryStore, PRECHECKS, SCHEDULES } from "../services.ts";
-import type { SessionContext, SessionTool } from "../sessions.ts";
-import type { Tier } from "../speakers.ts";
 import { fixed } from "./session-tool.ts";
 
 export interface MemoryOptions {

package/src/core/builtin/threads.ts

@@ -1,6 +1,6 @@
 import { join } from "node:path";
-import type { RoundtablePlugin } from "../plugin.ts";
-import { THREADS } from "../services.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
+import { THREADS } from "../plugin-api/services.ts";
 import { DispatchThreads } from "../threads/dispatch-threads.ts";
 
 export interface ThreadsOptions {

package/src/core/builtin/worker-sessions.ts

@@ -4,10 +4,10 @@ import {
 	formatModelRef,
 	type ModelRef,
 	type ThinkingLevel,
-} from "../models.ts";
+} from "../domain/models.ts";
 import { workerSessions } from "../modules/delegation/worker-session.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
-import { WORKER_SESSIONS } from "../services.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
+import { WORKER_SESSIONS } from "../plugin-api/services.ts";
 
 export interface WorkerSessionsPluginOptions {
 	/** Shared with the rest of the host, so logins refresh in one place. */

package/src/core/config/access.ts

@@ -8,9 +8,9 @@ import {
 	rulesOfSpeakerMap,
 } from "../identity/access-policy.ts";
 import { parseIdentity } from "../identity/actor-facts.ts";
-import { PRONOUNS } from "../identity.ts";
-import type { Logger } from "../log.ts";
-import type { TierMembers } from "../speakers.ts";
+import { PRONOUNS } from "../identity/owner-identity.ts";
+import type { TierMembers } from "../identity/speakers.ts";
+import type { Logger } from "../kernel/log.ts";
 import type { Pronouns, ResolvedConfig, RoundtableConfig } from "./config.ts";
 import {
 	either,

package/src/core/config/adapters.ts

@@ -1,6 +1,6 @@
 import type { ChannelContextOptions } from "../contract/channel-context.ts";
 import { ConfigError } from "../domain/errors.ts";
-import { type PeerBotsConfig, peerBotsShape } from "../routing/peer-bots.ts";
+import { type PeerBotsConfig, peerBotsShape } from "./peer-bots.ts";
 import {
 	bool,
 	guarded,

package/src/core/config/config-schema.ts

@@ -1,8 +1,8 @@
 import type { InterimTextMode } from "../domain/interim.ts";
+import { type EffortPolicy, THINKING_LEVELS } from "../domain/models.ts";
 import { isLocale, type Locale } from "../i18n/index.ts";
-import { type EffortPolicy, THINKING_LEVELS } from "../models.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
-import type { Tier } from "../speakers.ts";
+import type { Tier } from "../identity/speakers.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
 import { accessShape } from "./access.ts";
 import { discordShape } from "./adapters.ts";
 import { attachmentsShape } from "./attachments.ts";
@@ -60,6 +60,12 @@ const isPlugin = (value: unknown): value is RoundtablePlugin =>
 	typeof (value as { name?: unknown }).name === "string" &&
 	typeof (value as { setup?: unknown }).setup === "function";
 
+/**
+ * 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;
+
 export const configSchema = shape({
 	name: optional(text),
 	owner: optional(

package/src/core/config/config.ts

@@ -4,22 +4,21 @@ import { CATALOG, type Hex } from "../../characters/index.ts";
 import type { AgentSeed } from "../agents/agent-rules.ts";
 import { ConfigError } from "../domain/errors.ts";
 import type { InterimTextMode } from "../domain/interim.ts";
-import { DRAIN_LIMIT_MS } from "../drain.ts";
-import type { Locale } from "../i18n/index.ts";
-import type { AccessRules } from "../identity/access-policy.ts";
-import type { ProfileRules } from "../identity/profiles.ts";
-import type { OwnerIdentity } from "../identity.ts";
 import {
 	type EffortPolicy,
 	type ModelRef,
 	parseModelRef,
 	type ThinkingLevel,
-} from "../models.ts";
-import type { PerPrincipalLimits } from "../modules/background/personal-target.ts";
-import type { AgentTools, RoundtablePlugin } from "../plugin.ts";
+} from "../domain/models.ts";
+import type { Locale } from "../i18n/index.ts";
+import type { AccessRules } from "../identity/access-policy.ts";
+import type { OwnerIdentity } from "../identity/owner-identity.ts";
+import type { ProfileRules } from "../identity/profiles.ts";
+import type { Tier, TierMembers } from "../identity/speakers.ts";
+import type { AgentTools, RoundtablePlugin } from "../plugin-api/plugin.ts";
 import { PRIMARY_CHARS } from "../runtime/interim-text.ts";
 import type { ShellEnvConfig } from "../shared/child-env.ts";
-import type { Tier, TierMembers } from "../speakers.ts";
+import type { PerPrincipalLimits } from "../shared/personal-target.ts";
 import { type AccessConfig, accessOf } from "./access.ts";
 import {
 	type DiscordConfig,
@@ -29,7 +28,7 @@ import {
 } from "./adapters.ts";
 import { checkAgentServerOff, checkAgentTeamKeys } from "./agent-team.ts";
 import type { AttachmentsConfig } from "./attachments.ts";
-import { configSchema } from "./config-schema.ts";
+import { configSchema, DRAIN_LIMIT_MS } from "./config-schema.ts";
 import type { ConversationsConfig } from "./conversations.ts";
 import {
 	type HelpersConfig,

package/src/core/config/ops.ts

@@ -1,5 +1,5 @@
 import { ConfigError } from "../domain/errors.ts";
-import type { ChannelKey } from "../sessions.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
 
 /** Where the errors go: one agent, or one conversation. */
 export type ResolvedOps = { agent: string } | { conversation: ChannelKey };