pi-roundtable 0.33.0 → 0.35.0

package/src/core/{tool-tiers.ts → runtime/tool-tiers.ts}

@@ -1,8 +1,8 @@
-import { PluginError } from "./errors.ts";
-import type { Logger } from "./log.ts";
-import { ASK_USER_TOOL } from "./runtime/extensions/ask-user.ts";
-import { COMPACT_TOOL } from "./runtime/extensions/self-compact-guard.ts";
-import { type Tier, tierAtLeast } from "./speakers.ts";
+import { type Tier, tierAtLeast } from "../identity/speakers.ts";
+import { PluginError } from "../kernel/errors.ts";
+import type { Logger } from "../kernel/log.ts";
+import { ASK_USER_TOOL } from "./extensions/ask-user.ts";
+import { COMPACT_TOOL } from "./extensions/self-compact-guard.ts";
 
 /** The lowest tier that may use each tool; a tool that is not named needs the owner. */
 export interface ToolTiers {

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

@@ -1,6 +1,6 @@
 import type { TranscriptEntry, TurnResult } from "../domain/conversation.ts";
 import { AgentRunError } from "../domain/errors.ts";
-import { hasReplyFiles } from "../reply-files.ts";
+import { hasReplyFiles } from "../shared/reply-files.ts";
 import { lastAssistant, textOf } from "../shared/session-messages.ts";
 import { TRANSCRIPT_ENTRY_CHARS } from "./runtime-types.ts";
 

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

@@ -1,3 +1,4 @@
+import type { ChannelKey } from "../domain/sessions.ts";
 import type {
 	TurnLimit,
 	TurnTimeout,
@@ -6,7 +7,6 @@ import type {
 import { messages } from "../i18n/index.ts";
 import type { Approval } from "../interactions/prompts.ts";
 import { DEFAULT_YOLO_TIMEOUT_CARD_GRACE_MS } from "../modes/autonomy.ts";
-import type { ChannelKey } from "../sessions.ts";
 import type { PromptSlot } from "./prompt-slot.ts";
 import type { PiAgentRuntimeOptions } from "./runtime-types.ts";
 import type { ActivityTracker } from "./turn-activity.ts";

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

@@ -1,10 +1,10 @@
 import type { AgentSessionEvent } from "@earendil-works/pi-coding-agent";
 import type { TurnResult } from "../domain/conversation.ts";
 import { AgentRunError } from "../domain/errors.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
 import { type TurnTimeout, TurnTimeoutError } from "../domain/turn-timeout.ts";
 import { catalogFor } from "../i18n/index.ts";
 import { DEFAULT_AUTONOMY } from "../modes/autonomy.ts";
-import type { ChannelKey } from "../sessions.ts";
 import type { PromptSlot } from "./prompt-slot.ts";
 import type { PiAgentRuntimeOptions } from "./runtime-types.ts";
 import { activityTracker } from "./turn-activity.ts";

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

@@ -1,7 +1,7 @@
 import type { HeldCall } from "../domain/conversation.ts";
+import type { Tier } from "../identity/speakers.ts";
 import { MEMORY_TOOLS } from "../modules/memory/owner-memory.ts";
-import type { Tier } from "../speakers.ts";
-import { type ToolTiers, toolsForTier } from "../tool-tiers.ts";
+import { type ToolTiers, toolsForTier } from "./tool-tiers.ts";
 
 const MEMORY = new Set<string>(MEMORY_TOOLS);
 

package/src/core/runtime/worker-task.ts

@@ -3,7 +3,7 @@ import type {
 	ModelRuntime,
 } from "@earendil-works/pi-coding-agent";
 import { AgentRunError, ConfigError } from "../domain/errors.ts";
-import { parseModelRef } from "../models.ts";
+import { parseModelRef } from "../domain/models.ts";
 import { lastAssistant, textOf } from "../shared/session-messages.ts";
 
 export const MAX_REPORT_CHARS = 20_000;

package/src/core/shared/attach-file-tool.ts

@@ -4,7 +4,7 @@ import {
 	attachReplyFile,
 	REPLY_FILE_LIMITS,
 	ReplyFileError,
-} from "../reply-files.ts";
+} from "./reply-files.ts";
 import { toolError, toolText } from "./tool-result.ts";
 import {
 	findWorkspaceFile,

package/src/core/shared/child-env.ts

@@ -20,8 +20,8 @@ export interface ShellEnvConfig {
 	 * What the agents' shell gets of the host's environment besides `SHELL_ENV_NAMES` (the user,
 	 * locale, terminal, paths and proxies): host variables to `pass` by name and fixed values to
 	 * `set`. Plugins read it as `env.shellEnv` for shells of their own. Default: `pass` is
-	 * `DEFAULT_SHELL_PASS` (GH_TOKEN, so gh and git in the shell keep working); give `pass` to
-	 * replace it, `pass: []` for no host secret in the shell at all.
+	 * `DEFAULT_SHELL_PASS`, empty, so no host secret reaches the shell; a shell that runs `gh` or
+	 * `git push` needs a token named, as in `pass: ["GH_TOKEN"]`, or a narrower one in `set`.
 	 */
 	shellEnv?: ShellEnv;
 }
@@ -99,9 +99,7 @@ export function frozenShellEnv(shellEnv: ShellEnv): Readonly<ShellEnv> {
 }
 
 /** The host variables an agent's shell gets beyond `SHELL_ENV_NAMES` when `shellEnv.pass` is not given. */
-export const DEFAULT_SHELL_PASS: readonly string[] = Object.freeze([
-	"GH_TOKEN",
-]);
+export const DEFAULT_SHELL_PASS: readonly string[] = Object.freeze([]);
 
 /** The environment of an agent's shell: `childEnv` with `shellEnv`, whose `pass` defaults to `DEFAULT_SHELL_PASS`. */
 export function shellChildEnv(

package/src/core/shared/delegate-tool.ts

@@ -1,5 +1,5 @@
 import { Type } from "typebox";
-import { freeze } from "../freeze.ts";
+import { freeze } from "../kernel/freeze.ts";
 
 /** Hands web research to the cheaper worker model; shared by conversation sessions. */
 export const DELEGATE_TOOL = "delegate_task" as const;

package/src/core/shared/generate-image-tool.ts

@@ -7,7 +7,7 @@ import {
 	attachReplyFile,
 	REPLY_FILE_LIMITS,
 	ReplyFileError,
-} from "../reply-files.ts";
+} from "./reply-files.ts";
 import { toolError, toolText } from "./tool-result.ts";
 import {
 	findWorkspaceFile,

package/src/core/{modules/background → shared}/personal-target.ts

@@ -1,5 +1,5 @@
-import type { BackgroundTarget } from "../../contract/channels.ts";
-import { messages } from "../../i18n/index.ts";
+import type { BackgroundTarget } from "../contract/channels.ts";
+import { messages } from "../i18n/index.ts";
 
 /**
  * The host's own background target: every person's conversations whose claim answers background

package/src/core/{reply-files.ts → shared/reply-files.ts}

@@ -1,5 +1,5 @@
 import { AsyncLocalStorage } from "node:async_hooks";
-import type { ReplyFile, TurnResult } from "./domain/conversation.ts";
+import type { ReplyFile, TurnResult } from "../domain/conversation.ts";
 
 /** Limits across all tools in one turn, independent of the surface's own limits. */
 export const REPLY_FILE_LIMITS = Object.freeze({

package/src/core/testing/eager-catalog.ts

@@ -1,5 +1,5 @@
 import { messages, setLocale } from "../i18n/index.ts";
-import { setTimeZone } from "../time.ts";
+import { setTimeZone } from "../kernel/time.ts";
 
 const EAGER = "EAGER:";
 

package/src/core/testing/locale.ts

@@ -1,5 +1,5 @@
 import { type Locale, setLocale } from "../i18n/index.ts";
-import { setTimeZone } from "../time.ts";
+import { setTimeZone } from "../kernel/time.ts";
 
 /** What a test file runs under; the core's own suite uses the neutral defaults. */
 export interface TestLocale {

package/src/core/testing/map-identity.ts

@@ -3,7 +3,11 @@ import type { ActorFacts } from "../identity/actor-facts.ts";
 import type { ContactAssessor } from "../identity/contact.ts";
 import type { IdentityService } from "../identity/identity-service.ts";
 import type { IdentityLink, Principal } from "../identity/principal-store.ts";
-import { type SpeakerMap, speakerPolicy, tierAtLeast } from "../speakers.ts";
+import {
+	type SpeakerMap,
+	speakerPolicy,
+	tierAtLeast,
+} from "../identity/speakers.ts";
 
 /**
  * Who a 0.8 speaker map serves, for a test without a database: each person their own principal,

package/src/core/testing/module-sessions.ts

@@ -2,13 +2,13 @@ import type {
 	ExtensionAPI,
 	ExtensionFactory,
 } from "@earendil-works/pi-coding-agent";
-import type { OwnerIdentity } from "../identity.ts";
 import type {
 	AgentTurnScope,
 	ChannelKey,
 	SessionContext,
-} from "../sessions.ts";
-import { type Speaker, THE_SPEAKER } from "../speakers.ts";
+} from "../domain/sessions.ts";
+import type { OwnerIdentity } from "../identity/owner-identity.ts";
+import { type Speaker, THE_SPEAKER } from "../identity/speakers.ts";
 import { OWNER_CHANNEL, type setUpModules } from "./modules.ts";
 import { OWNER_SPEAKER } from "./owner.ts";
 

package/src/core/testing/modules.ts

@@ -9,22 +9,20 @@ import type { ConversationRegistry } from "../conversations/conversation-registr
 import type { ChannelKey } from "../domain/conversation.ts";
 import type { IdentityService } from "../identity/identity-service.ts";
 import type { Principal } from "../identity/principal-store.ts";
-import { silentLogger } from "../log.ts";
-import { PERSONAL_TARGET } from "../modules/background/personal-target.ts";
+import type { Tier } from "../identity/speakers.ts";
+import { silentLogger } from "../kernel/log.ts";
 import type { SkillStore } from "../modules/skills/skill-store.ts";
 import {
 	type Contribution,
 	type PluginContext,
 	pluginContext,
 	type RoundtablePlugin,
-} from "../plugin.ts";
-import {
-	type DirectChannelProvider,
-	directChannelsPort,
-} from "../presence/direct-channels.ts";
-import { ServiceRegistry } from "../registry/services.ts";
-import { surfacePort } from "../routing/surface-port.ts";
-import type { AgentServer, MemoryStore, ScheduleStore } from "../services.ts";
+} from "../plugin-api/plugin.ts";
+import type {
+	AgentServer,
+	MemoryStore,
+	ScheduleStore,
+} from "../plugin-api/services.ts";
 import {
 	AGENTS,
 	CONVERSATIONS,
@@ -32,10 +30,16 @@ import {
 	MEMORY,
 	SCHEDULES,
 	THREADS,
-} from "../services.ts";
-import type { Tier } from "../speakers.ts";
+} from "../plugin-api/services.ts";
+import {
+	type DirectChannelProvider,
+	directChannelsPort,
+} from "../presence/direct-channels.ts";
+import { ServiceRegistry } from "../registry/services.ts";
+import { surfacePort } from "../routing/surface-port.ts";
+import { toolTiers } from "../runtime/tool-tiers.ts";
+import { PERSONAL_TARGET } from "../shared/personal-target.ts";
 import type { DispatchThreads } from "../threads/dispatch-threads.ts";
-import { toolTiers } from "../tool-tiers.ts";
 
 /** What the modules' tools did, for a test to read. */
 export interface ModuleRecord {

package/src/core/testing/owner.ts

@@ -1,6 +1,6 @@
+import type { OwnerIdentity } from "../identity/owner-identity.ts";
 import type { Principal } from "../identity/principal-store.ts";
-import type { OwnerIdentity } from "../identity.ts";
-import type { Speaker } from "../speakers.ts";
+import type { Speaker } from "../identity/speakers.ts";
 
 /** The owner tests speak for; its words match the texts the tests expect. */
 export const TEST_OWNER: OwnerIdentity = {

package/src/core/testing/recording-logger.ts

@@ -1,4 +1,4 @@
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 
 /** One line a recording logger kept. */
 export interface RecordedLog {

package/src/core/testing/run-tool.ts

@@ -4,12 +4,12 @@ import type {
 } from "@earendil-works/pi-coding-agent";
 import type { ClientPart } from "../domain/client.ts";
 import type { ReplyFile } from "../domain/conversation.ts";
-import { PluginError } from "../errors.ts";
+import { PluginError } from "../kernel/errors.ts";
 import {
 	attachReplyFile,
 	hasReplyFileScope,
 	withReplyFiles,
-} from "../reply-files.ts";
+} from "../shared/reply-files.ts";
 
 /** What a session registers of a tool: the call the model's tool call reaches. */
 export interface RegisteredTool {

package/src/core/testing/surface-contract-support.ts

@@ -1,11 +1,11 @@
 import type { InboundMessage } from "../contract/channels.ts";
+import type { Speaker } from "../identity/speakers.ts";
 import {
 	type Approval,
 	type ApprovedBy,
 	type PromptScope,
 	promptScope,
 } from "../interactions/prompts.ts";
-import type { Speaker } from "../speakers.ts";
 import type {
 	SurfaceContractAnswerer,
 	SurfaceContractSubject,

package/src/core/testing/surface-contract.ts

@@ -2,13 +2,13 @@ import { describe, test } from "bun:test";
 import type { ChatSurface } from "../contract/surface.ts";
 import { parseChannelKey } from "../contract/surface.ts";
 import type { TurnProgress } from "../domain/progress.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
+import type { Speaker } from "../identity/speakers.ts";
 import type { Approval } from "../interactions/prompts.ts";
 import type {
 	Questionnaire,
 	QuestionnaireAnswer,
 } from "../interactions/questionnaire.ts";
-import type { ChannelKey } from "../sessions.ts";
-import type { Speaker } from "../speakers.ts";
 import { QUESTIONNAIRE_CHECKS } from "./surface-contract-questionnaire.ts";
 import {
 	answeredOnlyByThem,

package/src/core/testing/test-host.ts

@@ -11,7 +11,6 @@ import { type RoundtableConfig, resolveConfig } from "../config/config.ts";
 import type { ConversationPort } from "../contract/channels.ts";
 import type { AgentRuntime } from "../contract/runtime.ts";
 import type { ChatSurface } from "../contract/surface.ts";
-import { defineRoundtable, discordOwnerOf } from "../define-roundtable.ts";
 import { CommandCollection } from "../discord/command-collection.ts";
 import type { ComposedCommands } from "../discord/compose-commands.ts";
 import type { DiscordConnection } from "../discord/connection.ts";
@@ -22,21 +21,22 @@ import type {
 } from "../discord/interaction-module.ts";
 import { commandGuard, ownerRootCommand } from "../discord/owner-command.ts";
 import type { DiscordPoster } from "../discord/poster/poster.ts";
-import type { HoldDescription } from "../holds.ts";
-import { Roundtable } from "../host.ts";
-import { silentLogger } from "../log.ts";
-import type { PluginContext, RoundtablePlugin } from "../plugin.ts";
-import { CompactionTiers } from "../runtime/compaction-tiers.ts";
-import { privateCompaction } from "../runtime/extensions/private-memory.ts";
-import { sessionExtensions } from "../runtime/runtime-types.ts";
-import { IDENTITY } from "../services.ts";
 import type {
 	AgentTurnScope,
 	ChannelKey,
 	SessionContext,
-} from "../sessions.ts";
-import { type Speaker, THE_SPEAKER } from "../speakers.ts";
-import { toolTurn } from "../tool-turn.ts";
+} from "../domain/sessions.ts";
+import { defineRoundtable, discordOwnerOf } from "../host/define-roundtable.ts";
+import { Roundtable } from "../host/host.ts";
+import { type Speaker, THE_SPEAKER } from "../identity/speakers.ts";
+import { silentLogger } from "../kernel/log.ts";
+import type { HoldDescription } from "../plugin-api/holds.ts";
+import type { PluginContext, RoundtablePlugin } from "../plugin-api/plugin.ts";
+import { IDENTITY } from "../plugin-api/services.ts";
+import { toolTurn } from "../plugin-api/tool-turn.ts";
+import { CompactionTiers } from "../runtime/compaction-tiers.ts";
+import { privateCompaction } from "../runtime/extensions/private-memory.ts";
+import { sessionExtensions } from "../runtime/runtime-types.ts";
 import { testDatabaseUrl } from "./database.ts";
 import { fakeDiscordPoster } from "./fake-poster.ts";
 import { callRegisteredTool, registeredTools, toolNamed } from "./run-tool.ts";

package/src/core/testing/thread-host.ts

@@ -3,7 +3,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import type { ChatSurface } from "../contract/surface.ts";
 import type { InterimMessage } from "../domain/interim.ts";
-import { silentLogger } from "../log.ts";
+import { silentLogger } from "../kernel/log.ts";
 import { surfacePort } from "../routing/surface-port.ts";
 import {
 	DispatchThreads,

package/src/core/testing/tool-set.ts

@@ -1,9 +1,9 @@
 import type { ChannelKey } from "../domain/conversation.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
+import type { AgentTurnScope } from "../domain/sessions.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
+import { AGENTS } from "../plugin-api/services.ts";
 import { ASK_USER_TOOL } from "../runtime/extensions/ask-user.ts";
 import { COMPACT_TOOL } from "../runtime/extensions/self-compact-guard.ts";
-import { AGENTS } from "../services.ts";
-import type { AgentTurnScope } from "../sessions.ts";
 import type { TestHost } from "./test-host.ts";
 
 export const scout: AgentTurnScope = {

package/src/core/threads/dispatch-threads.ts

@@ -15,7 +15,7 @@ import {
 import type { ChannelKey } from "../domain/conversation.ts";
 import type { InterimMessage, 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 { threadsOfHost } from "./host-threads.ts";
 
 /** The only surface a `ThreadHost` serves. */

package/src/core/tool-set.snapshot.json

@@ -91,6 +91,9 @@
 				"group_update",
 				"helper_create",
 				"helper_end",
+				"helper_preset_delete",
+				"helper_preset_list",
+				"helper_preset_set",
 				"memory_add",
 				"memory_remove",
 				"memory_search",
@@ -125,6 +128,9 @@
 				"group_update",
 				"helper_create",
 				"helper_end",
+				"helper_preset_delete",
+				"helper_preset_list",
+				"helper_preset_set",
 				"message_agent",
 				"read",
 				"skill_create",
@@ -185,6 +191,9 @@
 				"group_update",
 				"helper_create",
 				"helper_end",
+				"helper_preset_delete",
+				"helper_preset_list",
+				"helper_preset_set",
 				"memory_add",
 				"memory_remove",
 				"memory_search",
@@ -281,6 +290,9 @@
 		"group_update": "admin",
 		"helper_create": "member",
 		"helper_end": "member",
+		"helper_preset_delete": "member",
+		"helper_preset_list": "member",
+		"helper_preset_set": "member",
 		"memory_add": "member",
 		"memory_remove": "member",
 		"memory_search": "member",

package/src/index.ts

@@ -56,6 +56,10 @@ export type {
 export type { ConversationsConfig } from "./core/config/conversations.ts";
 export type { HelpersConfig } from "./core/config/helpers.ts";
 export type { LimitsConfig } from "./core/config/limits.ts";
+export type {
+	PeerBotEntry,
+	PeerBotsConfig,
+} from "./core/config/peer-bots.ts";
 export type { ProfilesConfig } from "./core/config/profiles.ts";
 export type {
 	AgentRoutes,
@@ -134,18 +138,6 @@ export type {
 } from "./core/conversations/conversation-registry.ts";
 export type { Migration, MigrationReport } from "./core/db/migrations.ts";
 export { migrateDatabase } from "./core/db/migrations.ts";
-export type {
-	ToolContribution,
-	ToolOutput,
-	ToolSpec,
-	ToolTurn,
-} from "./core/define.ts";
-export { definePlugin, defineTool, ToolRefusal } from "./core/define.ts";
-export type {
-	DefinedRoundtable,
-	DefineOverrides,
-} from "./core/define-roundtable.ts";
-export { defineRoundtable } from "./core/define-roundtable.ts";
 export type {
 	AttachmentFailure,
 	ModelImage,
@@ -183,34 +175,37 @@ export type {
 	InterimPosts,
 	InterimTextMode,
 } from "./core/domain/interim.ts";
+export type { ThinkingLevel, ThinkingSetting } from "./core/domain/models.ts";
 export type { TurnConversation, TurnRequest } from "./core/domain/ports.ts";
 export type { HoldRefusal, TurnProgress } from "./core/domain/progress.ts";
 export type { RoundEnd, RoundProgress } from "./core/domain/round.ts";
+export type {
+	AgentTurnScope,
+	ChannelKey,
+	SessionContext,
+	SessionConversation,
+	SessionPlan,
+	SessionTool,
+	SessionToolSnapshot,
+	ToolSelection,
+	TransientTask,
+	TurnSelection,
+} from "./core/domain/sessions.ts";
 export {
 	type TurnLimit,
 	type TurnTimeout,
 	type TurnTimeoutEnd,
 	TurnTimeoutError,
 } from "./core/domain/turn-timeout.ts";
-export type { DrainOptions } from "./core/drain.ts";
-export {
-	HostStoppingError,
-	JudgeError,
-	MigrationError,
-	NotLinkedError,
-	PluginError,
-	ProviderError,
-} from "./core/errors.ts";
 export type {
-	ClassedHold,
-	HoldCheck,
-	HoldContext,
-	HoldDescription,
-	HoldRule,
-} from "./core/holds.ts";
-export type { HostEnvironment, RoundtableOptions } from "./core/host.ts";
-export { Roundtable } from "./core/host.ts";
-export type { RegistrationReport } from "./core/host-registration.ts";
+	DefinedRoundtable,
+	DefineOverrides,
+} from "./core/host/define-roundtable.ts";
+export { defineRoundtable } from "./core/host/define-roundtable.ts";
+export type { DrainOptions } from "./core/host/drain.ts";
+export type { HostEnvironment, RoundtableOptions } from "./core/host/host.ts";
+export { Roundtable } from "./core/host/host.ts";
+export type { RegistrationReport } from "./core/host/host-registration.ts";
 export type {
 	HttpRoute,
 	ListenerAddress,
@@ -250,6 +245,8 @@ export type {
 	ProfileRules,
 	ProfileSource,
 } from "./core/identity/profiles.ts";
+export type { Speaker, Tier } from "./core/identity/speakers.ts";
+export { THE_SPEAKER, TIERS } from "./core/identity/speakers.ts";
 export type {
 	Approval,
 	ApprovalDetails,
@@ -279,18 +276,21 @@ export {
 	validateQuestionnaire,
 } from "./core/interactions/questionnaire.ts";
 export type { JudgeModel } from "./core/judging/model-judge.ts";
-export type { LogEntry, LogFn, Logger } from "./core/log.ts";
-export type { ThinkingLevel, ThinkingSetting } from "./core/models.ts";
+export {
+	HostStoppingError,
+	JudgeError,
+	MigrationError,
+	NotLinkedError,
+	PluginError,
+	ProviderError,
+} from "./core/kernel/errors.ts";
+export type { LogEntry, LogFn, Logger } from "./core/kernel/log.ts";
 export type {
 	AutoApproval,
 	ConversationMode,
 	ConversationModes,
 	ModeChange,
 } from "./core/modes/conversation-modes.ts";
-export {
-	PERSONAL_TARGET,
-	type PerPrincipalLimits,
-} from "./core/modules/background/personal-target.ts";
 export type {
 	DelegationJob,
 	DelegationOutcome,
@@ -343,6 +343,24 @@ export type {
 } from "./core/modules/skills/skill-rules.ts";
 export { SkillConflictError } from "./core/modules/skills/skill-rules.ts";
 export type { SkillGroup } from "./core/modules/skills/skill-store.ts";
+export type {
+	ToolContribution,
+	ToolOutput,
+	ToolSpec,
+	ToolTurn,
+} from "./core/plugin-api/define.ts";
+export {
+	definePlugin,
+	defineTool,
+	ToolRefusal,
+} from "./core/plugin-api/define.ts";
+export type {
+	ClassedHold,
+	HoldCheck,
+	HoldContext,
+	HoldDescription,
+	HoldRule,
+} from "./core/plugin-api/holds.ts";
 export type {
 	ActionEvent,
 	AgentTools,
@@ -364,26 +382,7 @@ export type {
 	TurnEndEvent,
 	TurnEvent,
 	TurnProgressEvent,
-} from "./core/plugin.ts";
-export type {
-	DirectChannelProvider,
-	DirectChannels,
-	DirectReach,
-} from "./core/presence/direct-channels.ts";
-export {
-	attachReplyFile,
-	REPLY_FILE_LIMITS,
-	ReplyFileError,
-	withReplyFiles,
-} from "./core/reply-files.ts";
-export type {
-	ConversationTurnInput,
-	ConversationTurns,
-} from "./core/routing/conversation-turns.ts";
-export type {
-	PeerBotEntry,
-	PeerBotsConfig,
-} from "./core/routing/peer-bots.ts";
+} from "./core/plugin-api/plugin.ts";
 export type {
 	AgentChange,
 	AgentDirectory,
@@ -401,7 +400,7 @@ export type {
 	SpeakerMemory,
 	WorkerSessionRequest,
 	WorkerSessions,
-} from "./core/services.ts";
+} from "./core/plugin-api/services.ts";
 export {
 	AGENTS,
 	BACKGROUND_TURNS,
@@ -420,20 +419,25 @@ export {
 	SKILLS,
 	THREADS,
 	WORKER_SESSIONS,
-} from "./core/services.ts";
+} from "./core/plugin-api/services.ts";
 export type {
-	AgentTurnScope,
-	ChannelKey,
-	SessionContext,
-	SessionConversation,
-	SessionPlan,
-	SessionTool,
-	SessionToolSnapshot,
-	ToolSelection,
-	TransientTask,
-	TurnSelection,
-} from "./core/sessions.ts";
+	DirectChannelProvider,
+	DirectChannels,
+	DirectReach,
+} from "./core/presence/direct-channels.ts";
+export type {
+	ConversationTurnInput,
+	ConversationTurns,
+} from "./core/routing/conversation-turns.ts";
+export type { ToolTiers, ToolTierTable } from "./core/runtime/tool-tiers.ts";
 export type { ShellEnv, ShellEnvConfig } from "./core/shared/child-env.ts";
-export type { Speaker, Tier } from "./core/speakers.ts";
-export { THE_SPEAKER, TIERS } from "./core/speakers.ts";
-export type { ToolTiers, ToolTierTable } from "./core/tool-tiers.ts";
+export {
+	PERSONAL_TARGET,
+	type PerPrincipalLimits,
+} from "./core/shared/personal-target.ts";
+export {
+	attachReplyFile,
+	REPLY_FILE_LIMITS,
+	ReplyFileError,
+	withReplyFiles,
+} from "./core/shared/reply-files.ts";