pi-roundtable 0.33.0 → 0.35.0

package/src/core/modules/schedules/precheck-tools.ts

@@ -1,15 +1,15 @@
 import { parse } from "@babel/parser";
 import type { Node, Program } from "@babel/types";
 import { ScheduleError } from "../../domain/errors.ts";
+import { messages } from "../../i18n/index.ts";
+import type { Tier } from "../../identity/speakers.ts";
 import {
 	type HoldCheck,
 	type HoldContext,
 	type HoldRule,
 	higherTier,
-} from "../../holds.ts";
-import { messages } from "../../i18n/index.ts";
-import type { Tier } from "../../speakers.ts";
-import type { ToolTiers } from "../../tool-tiers.ts";
+} from "../../plugin-api/holds.ts";
+import type { ToolTiers } from "../../runtime/tool-tiers.ts";
 import type { PrecheckRegistry } from "./prechecks.ts";
 
 /**

package/src/core/modules/schedules/prechecks.ts

@@ -1,6 +1,6 @@
 import type { ChannelKey } from "../../domain/conversation.ts";
-import { PluginError } from "../../errors.ts";
-import type { Tier } from "../../speakers.ts";
+import type { Tier } from "../../identity/speakers.ts";
+import { PluginError } from "../../kernel/errors.ts";
 import type { Schedule } from "./schedule-store.ts";
 
 /** How long a precheck may run before it counts as failed, unless it sets its own `timeoutMs`. */

package/src/core/modules/schedules/recurrence.ts

@@ -1,6 +1,11 @@
 import { ScheduleError } from "../../domain/errors.ts";
 import { messages } from "../../i18n/index.ts";
-import { timeZone, zonedDate, zonedInstant, zonedStamp } from "../../time.ts";
+import {
+	timeZone,
+	zonedDate,
+	zonedInstant,
+	zonedStamp,
+} from "../../kernel/time.ts";
 
 export type Weekday = "sun" | "mon" | "tue" | "wed" | "thu" | "fri" | "sat";
 

package/src/core/modules/schedules/schedule-prechecks.ts

@@ -1,7 +1,7 @@
-import type { HoldCheck } from "../../holds.ts";
-import type { Logger } from "../../log.ts";
-import type { Tier } from "../../speakers.ts";
-import { timeZone, zonedStamp } from "../../time.ts";
+import type { Tier } from "../../identity/speakers.ts";
+import type { Logger } from "../../kernel/log.ts";
+import { timeZone, zonedStamp } from "../../kernel/time.ts";
+import type { HoldCheck } from "../../plugin-api/holds.ts";
 import { type PrecheckTool, precheckScriptTools } from "./precheck-tools.ts";
 import {
 	type Precheck,

package/src/core/modules/schedules/schedule-store.ts

@@ -2,8 +2,8 @@ import type { SQL } from "bun";
 import type { Migration } from "../../db/migrations.ts";
 import type { ChannelKey } from "../../domain/conversation.ts";
 import { ScheduleError } from "../../domain/errors.ts";
-import type { ScheduleStore } from "../../services.ts";
-import type { Tier } from "../../speakers.ts";
+import type { Tier } from "../../identity/speakers.ts";
+import type { ScheduleStore } from "../../plugin-api/services.ts";
 import type { PrecheckTool } from "./precheck-tools.ts";
 import type { Recurrence } from "./recurrence.ts";
 

package/src/core/modules/schedules/schedule-tools.ts

@@ -1,13 +1,13 @@
 import type { BackgroundTarget } from "../../contract/channels.ts";
 import type { ChannelKey } from "../../domain/conversation.ts";
 import { ScheduleError } from "../../domain/errors.ts";
-import type { HoldCheck } from "../../holds.ts";
 import { messages } from "../../i18n/index.ts";
 import { SYSTEM_PRINCIPAL } from "../../identity/principal-store.ts";
-import type { ScheduleStore } from "../../services.ts";
+import { type Tier, tierAtLeast } from "../../identity/speakers.ts";
+import { timeZone, zonedStamp } from "../../kernel/time.ts";
+import type { HoldCheck } from "../../plugin-api/holds.ts";
+import type { ScheduleStore } from "../../plugin-api/services.ts";
 import type { ScheduleToolName } from "../../shared/schedule-tools.ts";
-import { type Tier, tierAtLeast } from "../../speakers.ts";
-import { timeZone, zonedStamp } from "../../time.ts";
 import { precheckCatalog } from "./precheck-catalog.ts";
 import { type PrecheckTool, precheckScriptTools } from "./precheck-tools.ts";
 import { PRECHECK_SCRIPT_CHARS, type PrecheckRegistry } from "./prechecks.ts";

package/src/core/modules/schedules/scheduled-turn-text.ts

@@ -1,5 +1,5 @@
 import { messages } from "../../i18n/index.ts";
-import { timeZone, zonedStamp } from "../../time.ts";
+import { timeZone, zonedStamp } from "../../kernel/time.ts";
 import type { PrecheckFinding } from "./prechecks.ts";
 import { describeRecurrence } from "./recurrence.ts";
 import type { Schedule } from "./schedule-store.ts";

package/src/core/modules/schedules/scheduler.ts

@@ -2,9 +2,9 @@ import type {
 	BackgroundRunsAs,
 	ScheduledOutcome,
 } from "../../contract/channels.ts";
-import type { HoldCheck } from "../../holds.ts";
-import type { Logger } from "../../log.ts";
-import type { ScheduleStore } from "../../services.ts";
+import type { Logger } from "../../kernel/log.ts";
+import type { HoldCheck } from "../../plugin-api/holds.ts";
+import type { ScheduleStore } from "../../plugin-api/services.ts";
 import {
 	type PrecheckFinding,
 	type PrecheckRegistry,

package/src/core/modules/schedules/schedules.ts

@@ -3,20 +3,20 @@ import { Type } from "typebox";
 import type { BackgroundTarget } from "../../contract/channels.ts";
 import type { ChannelKey } from "../../domain/conversation.ts";
 import { ScheduleError } from "../../domain/errors.ts";
-import type { HoldCheck } from "../../holds.ts";
 import { activeLocale } from "../../i18n/index.ts";
+import type { Speaker } from "../../identity/speakers.ts";
+import { timeZone } from "../../kernel/time.ts";
+import type { HoldCheck } from "../../plugin-api/holds.ts";
+import type { ScheduleStore } from "../../plugin-api/services.ts";
 import {
 	type ToolInput,
 	textToolsExtension,
 } from "../../runtime/text-tools.ts";
-import type { ScheduleStore } from "../../services.ts";
+import { PERSONAL_TARGET } from "../../shared/personal-target.ts";
 import {
 	type ScheduleToolSpec,
 	scheduleToolSpecs,
 } from "../../shared/schedule-tools.ts";
-import type { Speaker } from "../../speakers.ts";
-import { timeZone } from "../../time.ts";
-import { PERSONAL_TARGET } from "../background/personal-target.ts";
 import type { PrecheckRegistry } from "./prechecks.ts";
 import { callScheduleTool } from "./schedule-tools.ts";
 

package/src/core/modules/skills/missing-warning.ts

@@ -1,4 +1,4 @@
-import type { Logger } from "../../log.ts";
+import type { Logger } from "../../kernel/log.ts";
 
 /**
  * Warns of a carried skill that is missing once per agent and name. The registry is asked what an

package/src/core/modules/skills/package-skills.ts

@@ -1,6 +1,6 @@
 import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
 import { isAbsolute, join, relative as relativePath, resolve } from "node:path";
-import { PluginError } from "../../errors.ts";
+import { PluginError } from "../../kernel/errors.ts";
 import { packageDir } from "../../shared/package-dir.ts";
 import {
 	BUILTIN_SKILLS,

package/src/core/modules/skills/skill-registry.ts

@@ -1,8 +1,8 @@
 import { mkdirSync, readdirSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { AgentError } from "../../domain/errors.ts";
-import { PluginError } from "../../errors.ts";
-import type { SkillRegistry } from "../../services.ts";
+import { PluginError } from "../../kernel/errors.ts";
+import type { SkillRegistry } from "../../plugin-api/services.ts";
 import { WarnedMissing } from "./missing-warning.ts";
 import {
 	readSkillDocument,

package/src/core/modules/skills/skill-rules.ts

@@ -2,7 +2,7 @@ import { createHash } from "node:crypto";
 import { existsSync, readFileSync } from "node:fs";
 import { parseFrontmatter } from "@earendil-works/pi-coding-agent";
 import { AgentError } from "../../domain/errors.ts";
-import type { Logger } from "../../log.ts";
+import type { Logger } from "../../kernel/log.ts";
 import type { SkillStore } from "./skill-store.ts";
 
 /** Carried by every agent and worker, shipped in the release (behavior 20). */

package/src/core/modules/skills/skill-tools.ts

@@ -1,13 +1,13 @@
 import type { ExtensionFactory } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { AgentError } from "../../domain/errors.ts";
+import type { SkillRegistry } from "../../plugin-api/services.ts";
 import {
 	optionalString,
 	requiredString,
 	stringList,
 	textToolsExtension,
 } from "../../runtime/text-tools.ts";
-import type { SkillRegistry } from "../../services.ts";
 import {
 	MAX_SKILL_BODY_CHARS,
 	type StoredSkillRegistry,

package/src/core/ops/error-reporter.ts

@@ -1,7 +1,7 @@
 import { AsyncLocalStorage } from "node:async_hooks";
 import type { ScheduledOutcome } from "../contract/channels.ts";
-import type { LogEntry, Logger } from "../log.ts";
-import type { ChannelKey } from "../sessions.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
+import type { LogEntry, Logger } from "../kernel/log.ts";
 import { AlertThrottle } from "./alert-throttle.ts";
 
 /** Errors that are expected and never reported, matched against the message and the error's. */

package/src/core/ops/ops-alerts.ts

@@ -1,4 +1,4 @@
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 import { AlertThrottle } from "./alert-throttle.ts";
 
 const DEFAULT_WINDOW_MS = 60 * 60_000;

package/src/core/{define.ts → plugin-api/define.ts}

@@ -2,22 +2,28 @@ import type { Static, TObject } from "typebox";
 import type {
 	ToolAttachment,
 	ToolAttachmentInfo,
-} from "./attachments/tool-attachment.ts";
-import type { ClientPort } from "./domain/client.ts";
-import type { ReplyFile } from "./domain/conversation.ts";
-import { PluginError } from "./errors.ts";
-import { type HoldDescription, type HoldRule, isPromise } from "./holds.ts";
-import { messages } from "./i18n/index.ts";
-import type { ApprovedBy } from "./interactions/prompts.ts";
-import { type RoundtablePlugin, refuseRemovedFields } from "./plugin.ts";
-import type { AgentTurnScope, ChannelKey, SessionTool } from "./sessions.ts";
+} from "../attachments/tool-attachment.ts";
+import type { ClientPort } from "../domain/client.ts";
+import type { ReplyFile } from "../domain/conversation.ts";
+import type {
+	AgentTurnScope,
+	ChannelKey,
+	SessionTool,
+} from "../domain/sessions.ts";
+import { messages } from "../i18n/index.ts";
+import { type Speaker, TIERS, type Tier } from "../identity/speakers.ts";
+import type { ApprovedBy } from "../interactions/prompts.ts";
+import { PluginError } from "../kernel/errors.ts";
 import {
 	type ToolOutput,
 	toolError,
 	toolOutput,
-} from "./shared/tool-result.ts";
-import { type Speaker, TIERS, type Tier } from "./speakers.ts";
-import { toolTurn } from "./tool-turn.ts";
+} from "../shared/tool-result.ts";
+import { type HoldDescription, type HoldRule, isPromise } from "./holds.ts";
+import { type RoundtablePlugin, refuseRemovedFields } from "./plugin.ts";
+import { ToolRefusal, toolTurn } from "./tool-turn.ts";
+
+export { ToolRefusal };
 
 /** Tool names are lowercase words joined by underscores, like every tool the core ships. */
 const TOOL_NAME = /^[a-z][a-z0-9]*(_[a-z0-9]+)*$/;
@@ -91,14 +97,6 @@ export interface ToolTurn {
 	attachments?(): Promise<readonly ToolAttachmentInfo[]>;
 }
 
-/**
- * Thrown by a tool's `run` for a call the model should correct: the message becomes the tool's
- * error result, which the model reads. Any other error fails the call.
- */
-export class ToolRefusal extends Error {
-	override name = "ToolRefusal";
-}
-
 export interface ToolSpec<Schema extends TObject> {
 	/** Lowercase words joined by underscores; unique across every plugin. */
 	name: string;

package/src/core/{event-types.ts → plugin-api/event-types.ts}

@@ -1,4 +1,4 @@
-import type { ChannelKey } from "./sessions.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
 
 /** One thing a person did through a plugin's surface, as a handler hears of it. */
 export interface ActionEvent {

package/src/core/{holds.ts → plugin-api/holds.ts}

@@ -1,7 +1,7 @@
+import { type Tier, tierAtLeast } from "../identity/speakers.ts";
+import type { ApprovalDetails } from "../interactions/prompts.ts";
+import { PluginError } from "../kernel/errors.ts";
 import type { ToolTurn } from "./define.ts";
-import { PluginError } from "./errors.ts";
-import type { ApprovalDetails } from "./interactions/prompts.ts";
-import { type Tier, tierAtLeast } from "./speakers.ts";
 
 /**
  * How long the confirmation gate waits for a hold that looks things up before it describes the

package/src/core/{plugin-removed.ts → plugin-api/plugin-removed.ts}

@@ -1,5 +1,5 @@
-import type { ChatSurface } from "./contract/surface.ts";
-import { PluginError } from "./errors.ts";
+import type { ChatSurface } from "../contract/surface.ts";
+import { PluginError } from "../kernel/errors.ts";
 import type {
 	Contribution,
 	EventHandlers,

package/src/core/{plugin.ts → plugin-api/plugin.ts}

@@ -1,7 +1,7 @@
 import type { SQL } from "bun";
-import type { Hex } from "../characters/index.ts";
-import type { AgentSeed } from "./agents/agent-store.ts";
-import type { AttachmentPort } from "./contract/attachments.ts";
+import type { Hex } from "../../characters/index.ts";
+import type { AgentSeed } from "../agents/agent-store.ts";
+import type { AttachmentPort } from "../contract/attachments.ts";
 import type {
 	BackgroundTarget,
 	ChannelClaim,
@@ -9,35 +9,35 @@ import type {
 	MessageObserver,
 	ObserveFilter,
 	QueuePort,
-} from "./contract/channels.ts";
-import type { ChatCommand } from "./contract/chat-command.ts";
-import type { Providers, ResolvedProviders } from "./contract/providers.ts";
-import type { ServiceKey, Services } from "./contract/services.ts";
-import type { ChatSurface, SurfacePort } from "./contract/surface.ts";
-import type { Migration } from "./db/migrations.ts";
-import type { ToolContribution } from "./define.ts";
-import type { TurnProgress } from "./domain/progress.ts";
-import { PluginError } from "./errors.ts";
-import type { ActionEvent, MemberJoinedEvent } from "./event-types.ts";
-import type { HoldCheck, HoldRule } from "./holds.ts";
-import type { HttpRoute, ListenerAddress } from "./http/listeners.ts";
-import type { Locale } from "./i18n/index.ts";
-import type { Logger } from "./log.ts";
-import type {
-	DirectChannelProvider,
-	DirectChannels,
-} from "./presence/direct-channels.ts";
-import type { ConversationTurns } from "./routing/conversation-turns.ts";
+} from "../contract/channels.ts";
+import type { ChatCommand } from "../contract/chat-command.ts";
+import type { Providers, ResolvedProviders } from "../contract/providers.ts";
+import type { ServiceKey, Services } from "../contract/services.ts";
+import type { ChatSurface, SurfacePort } from "../contract/surface.ts";
+import type { Migration } from "../db/migrations.ts";
+import type { TurnProgress } from "../domain/progress.ts";
 import type {
 	AgentTurnScope,
 	ChannelKey,
 	SessionPlan,
 	SessionTool,
 	ToolSelection,
-} from "./sessions.ts";
-import type { ShellEnv } from "./shared/child-env.ts";
-import type { Speaker, Tier } from "./speakers.ts";
-import type { ToolTiers } from "./tool-tiers.ts";
+} from "../domain/sessions.ts";
+import type { HttpRoute, ListenerAddress } from "../http/listeners.ts";
+import type { Locale } from "../i18n/index.ts";
+import type { Speaker, Tier } from "../identity/speakers.ts";
+import { PluginError } from "../kernel/errors.ts";
+import type { Logger } from "../kernel/log.ts";
+import type {
+	DirectChannelProvider,
+	DirectChannels,
+} from "../presence/direct-channels.ts";
+import type { ConversationTurns } from "../routing/conversation-turns.ts";
+import type { ToolTiers } from "../runtime/tool-tiers.ts";
+import type { ShellEnv } from "../shared/child-env.ts";
+import type { ToolContribution } from "./define.ts";
+import type { ActionEvent, MemberJoinedEvent } from "./event-types.ts";
+import type { HoldCheck, HoldRule } from "./holds.ts";
 
 export type { ActionEvent, MemberJoinedEvent };
 

package/src/core/{services.ts → plugin-api/services.ts}

@@ -1,51 +1,51 @@
 import type { ExtensionFactory } from "@earendil-works/pi-coding-agent";
-import type { CharacterInput, CharacterSpec } from "../characters/index.ts";
-import type { Agent, AgentGroup } from "./agents/agent-rules.ts";
-import type { AvatarMode } from "./agents/agent-tools.ts";
-import type { HelperTeam } from "./agents/helper-ops.ts";
-import type { RoutingTable } from "./agents/routes.ts";
-import type { TeamStatus } from "./agents/team-status.ts";
-import type { ChannelContexts } from "./contract/channel-context.ts";
+import type { CharacterInput, CharacterSpec } from "../../characters/index.ts";
+import type { Agent, AgentGroup } from "../agents/agent-rules.ts";
+import type { AvatarMode } from "../agents/agent-tools.ts";
+import type { HelperTeam } from "../agents/helper-ops.ts";
+import type { RoutingTable } from "../agents/routes.ts";
+import type { TeamStatus } from "../agents/team-status.ts";
+import type { ChannelContexts } from "../contract/channel-context.ts";
 import type {
 	BackgroundRunsAs,
 	ScheduledOutcome,
-} from "./contract/channels.ts";
-import type { AgentRuntime } from "./contract/runtime.ts";
-import { type ServiceKey, serviceKey } from "./contract/services.ts";
-import type { ConversationRegistry } from "./conversations/conversation-registry.ts";
-import type { PendingConfirmation } from "./domain/conversation.ts";
-import type { HttpRoute } from "./http/listeners.ts";
-import type { IdentityLinks } from "./identity/identity-links.ts";
-import type { IdentityService } from "./identity/identity-service.ts";
-import type { PersonProfiles } from "./identity/profiles.ts";
-import type { ThinkingLevel, ThinkingSetting } from "./models.ts";
-import type { ConversationModes } from "./modes/conversation-modes.ts";
+} from "../contract/channels.ts";
+import type { AgentRuntime } from "../contract/runtime.ts";
+import { type ServiceKey, serviceKey } from "../contract/services.ts";
+import type { ConversationRegistry } from "../conversations/conversation-registry.ts";
+import type { PendingConfirmation } from "../domain/conversation.ts";
+import type { ThinkingLevel, ThinkingSetting } from "../domain/models.ts";
+import type { AgentTurnScope, ChannelKey } from "../domain/sessions.ts";
+import type { HttpRoute } from "../http/listeners.ts";
+import type { IdentityLinks } from "../identity/identity-links.ts";
+import type { IdentityService } from "../identity/identity-service.ts";
+import type { PersonProfiles } from "../identity/profiles.ts";
+import type { Speaker } from "../identity/speakers.ts";
+import type { ConversationModes } from "../modes/conversation-modes.ts";
 import type {
 	DelegationJob,
 	DelegationOutcome,
-} from "./modules/delegation/delegator.ts";
+} from "../modules/delegation/delegator.ts";
 import type {
 	Memory,
 	MemoryKind,
 	PromptMemory,
-} from "./modules/memory/owner-memory-store.ts";
+} from "../modules/memory/owner-memory-store.ts";
 import type {
 	PromptDocuments,
 	PromptVersion,
-} from "./modules/prompts/prompt-documents.ts";
+} from "../modules/prompts/prompt-documents.ts";
 import type {
 	PrecheckFinding,
 	PrecheckRegistry,
-} from "./modules/schedules/prechecks.ts";
+} from "../modules/schedules/prechecks.ts";
 import type {
 	NewSchedule,
 	Schedule,
 	ScheduleChange,
-} from "./modules/schedules/schedule-store.ts";
-import type { SkillRegistry } from "./modules/skills/skill-contract.ts";
-import type { AgentTurnScope, ChannelKey } from "./sessions.ts";
-import type { Speaker } from "./speakers.ts";
-import type { DispatchThreads } from "./threads/dispatch-threads.ts";
+} from "../modules/schedules/schedule-store.ts";
+import type { SkillRegistry } from "../modules/skills/skill-contract.ts";
+import type { DispatchThreads } from "../threads/dispatch-threads.ts";
 
 // The services the built-in plugins provide, and the ports they keep to. Each port is an
 // interface, so an object with the same methods satisfies it without being one of the built-in
@@ -497,4 +497,4 @@ export interface SpeakerMemory {
 	remove(text: string): Promise<string[]>;
 }
 
-export type { SkillRegistry } from "./modules/skills/skill-contract.ts";
+export type { SkillRegistry } from "../modules/skills/skill-contract.ts";

package/src/core/{tool-turn.ts → plugin-api/tool-turn.ts}

@@ -2,12 +2,19 @@ import {
 	AttachmentLookupError,
 	listAttachments,
 	openAttachment,
-} from "./attachments/tool-attachment.ts";
+} from "../attachments/tool-attachment.ts";
+import type { ClientPort } from "../domain/client.ts";
+import type { SessionContext } from "../domain/sessions.ts";
+import { attachReplyFile } from "../shared/reply-files.ts";
 import type { ToolTurn } from "./define.ts";
-import { ToolRefusal } from "./define.ts";
-import type { ClientPort } from "./domain/client.ts";
-import { attachReplyFile } from "./reply-files.ts";
-import type { SessionContext } from "./sessions.ts";
+
+/**
+ * Thrown by a tool's `run` for a call the model should correct: the message becomes the tool's
+ * error result, which the model reads. Any other error fails the call.
+ */
+export class ToolRefusal extends Error {
+	override name = "ToolRefusal";
+}
 
 /**
  * `port` as a tool sees it in a turn: every call carries the turn's `signal` beside the caller's,

package/src/core/presence/delivery-router.ts

@@ -1,7 +1,7 @@
 import type { SurfacePort } from "../contract/surface.ts";
 import { parseChannelKey } from "../contract/surface.ts";
 import type { ChannelKey } from "../domain/conversation.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 import { splitReply } from "../presentation/reply-splitter.ts";
 import type {
 	DirectChannelProvider,

package/src/core/presence/direct-channels.ts

@@ -1,6 +1,6 @@
 import type { SurfacePort } from "../contract/surface.ts";
 import type { ChannelKey } from "../domain/conversation.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 import { deliveryRouter } from "./delivery-router.ts";
 
 /**

package/src/core/registry/chat-commands.ts

@@ -1,7 +1,7 @@
 import { existsSync } from "node:fs";
 import { dirname, join } from "node:path";
 import type { ChatCommand } from "../contract/chat-command.ts";
-import { PluginError } from "../errors.ts";
+import { PluginError } from "../kernel/errors.ts";
 import { packageDir } from "../shared/package-dir.ts";
 
 const CHAT_COMMAND_NAME = /^[a-z][a-z0-9_-]*$/;

package/src/core/registry/contributions.ts

@@ -3,10 +3,16 @@ import type { AgentSeed } from "../agents/agent-store.ts";
 import type { BackgroundTarget, ChannelClaim } from "../contract/channels.ts";
 import type { ChatCommand } from "../contract/chat-command.ts";
 import type { ChatSurface } from "../contract/surface.ts";
-import type { ToolContribution } from "../define.ts";
-import { NotLinkedError, PluginError } from "../errors.ts";
-import { type HoldRule, holdChain } from "../holds.ts";
+import {
+	compileSessionPlan,
+	type SessionTool,
+	type ToolSelection,
+} from "../domain/sessions.ts";
 import type { HttpRoute } from "../http/listeners.ts";
+import { TIERS } from "../identity/speakers.ts";
+import { NotLinkedError, PluginError } from "../kernel/errors.ts";
+import type { ToolContribution } from "../plugin-api/define.ts";
+import { type HoldRule, holdChain } from "../plugin-api/holds.ts";
 import {
 	CONTRIBUTION_KEYS,
 	type Contribution,
@@ -21,19 +27,13 @@ import {
 	refuseRemovedParts,
 	refuseRemovedSurfaceMethods,
 	type Service,
-} from "../plugin.ts";
+} from "../plugin-api/plugin.ts";
 import {
 	type DirectChannelProvider,
 	directChannelsPort,
 } from "../presence/direct-channels.ts";
 import { refuseShellTools } from "../runtime/chat-only.ts";
-import {
-	compileSessionPlan,
-	type SessionTool,
-	type ToolSelection,
-} from "../sessions.ts";
-import { TIERS } from "../speakers.ts";
-import type { ToolTierTable } from "../tool-tiers.ts";
+import type { ToolTierTable } from "../runtime/tool-tiers.ts";
 import { ChatCommandSources, claimChatCommand } from "./chat-commands.ts";
 import { ServiceRegistry } from "./services.ts";
 import { surfaceService } from "./surface-service.ts";

package/src/core/registry/providers.ts

@@ -3,9 +3,9 @@ import type {
 	Providers,
 	ResolvedProviders,
 } from "../contract/providers.ts";
-import { PluginError, ProviderError } from "../errors.ts";
 import { type JudgeModel, ModelJudge } from "../judging/model-judge.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
+import { PluginError, ProviderError } from "../kernel/errors.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
 import { nearest } from "./contributions.ts";
 
 const SLOTS = [

package/src/core/registry/services.ts

@@ -1,6 +1,6 @@
 import type { ServiceKey, Services } from "../contract/services.ts";
-import { NotLinkedError, PluginError } from "../errors.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
+import { NotLinkedError, PluginError } from "../kernel/errors.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
 
 /** The host's words for reading a service no plugin declares; `testPlugin` says how to give one instead. */
 const HOST_ADVICE =

package/src/core/registry/surface-service.ts

@@ -1,5 +1,5 @@
 import type { ChatSurface } from "../contract/surface.ts";
-import type { PluginContext, Service } from "../plugin.ts";
+import type { PluginContext, Service } from "../plugin-api/plugin.ts";
 
 /**
  * The surface as a service: it starts with the router's `handle` as its delivery, which drops

package/src/core/routing/actor-of.ts

@@ -1,7 +1,7 @@
 import type { InboundMessage } from "../contract/channels.ts";
 import { parseChannelKey } from "../contract/surface.ts";
 import type { ActorFacts } from "../identity/actor-facts.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 
 /**
  * Who wrote the message, as its surface reports them; a surface that reports no `actor` has it

package/src/core/routing/channel-queue.ts

@@ -1,5 +1,5 @@
-import { HostStoppingError } from "../errors.ts";
-import type { ChannelKey } from "../sessions.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
+import { HostStoppingError } from "../kernel/errors.ts";
 
 /** Runs tasks one at a time per channel, in arrival order; different channels run independently. */
 export class ChannelQueue {

package/src/core/routing/channel-router.ts

@@ -14,12 +14,12 @@ import {
 	STEERED_MARK,
 } from "../contract/channels.ts";
 import type { SurfacePort } from "../contract/surface.ts";
-import { HostStoppingError, PluginError } from "../errors.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
 import { messages } from "../i18n/index.ts";
 import type { Contact, ContactAssessor } from "../identity/contact.ts";
 import type { IdentityService } from "../identity/identity-service.ts";
-import type { Logger } from "../log.ts";
-import type { ChannelKey } from "../sessions.ts";
+import { HostStoppingError, PluginError } from "../kernel/errors.ts";
+import type { Logger } from "../kernel/log.ts";
 import { actorOf } from "./actor-of.ts";
 import { speakerOf } from "./background-speaker.ts";
 import type { ChannelQueue } from "./channel-queue.ts";