pi-roundtable 0.33.0 → 0.35.0

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";
 
 /**

package/src/core/identity/caching-principal-store.ts

@@ -1,4 +1,3 @@
-import type { Tier } from "../speakers.ts";
 import type {
 	IdentityRef,
 	LinkSource,
@@ -7,6 +6,7 @@ import type {
 	Pronouns,
 	RoleSource,
 } from "./principal-store.ts";
+import type { Tier } from "./speakers.ts";
 
 /** How long a read of the store is reused; a change another process makes is seen after it. */
 export const CACHE_MS = 30_000;

package/src/core/identity/config-owner.ts

@@ -1,5 +1,5 @@
 import { ConfigError } from "../domain/errors.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 import type { AccessOwner } from "./access-policy.ts";
 import { identityOf } from "./actor-facts.ts";
 import type { DeclaredIdentity } from "./plugin-identities.ts";

package/src/core/identity/contact.ts

@@ -1,6 +1,6 @@
-import type { ChannelKey } from "../sessions.ts";
-import type { Speaker } from "../speakers.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
 import type { ActorFacts } from "./actor-facts.ts";
+import type { Speaker } from "./speakers.ts";
 
 /**
  * A person a surface reports, assessed before any claim takes their message: who they would be,

package/src/core/identity/identity-links.ts

@@ -1,6 +1,6 @@
 import { IdentityError } from "../domain/errors.ts";
-import { freeze } from "../freeze.ts";
-import type { Logger } from "../log.ts";
+import { freeze } from "../kernel/freeze.ts";
+import type { Logger } from "../kernel/log.ts";
 import type { SelfLinkRules } from "./access-policy.ts";
 import { identityOf, parseIdentity } from "./actor-facts.ts";
 import {

package/src/core/identity/identity-port.ts

@@ -1,7 +1,7 @@
-import type { ChannelKey } from "../sessions.ts";
-import type { Speaker, Tier } from "../speakers.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
 import type { ActorFacts } from "./actor-facts.ts";
 import type { IdentityLink, Principal, RoleGrant } from "./principal-store.ts";
+import type { Speaker, Tier } from "./speakers.ts";
 
 /**
  * Who the host serves: its principals, their identities, and their roles, read-only. Provided as

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

@@ -1,6 +1,5 @@
 import type { SQL } from "bun";
 import type { Migration } from "../db/migrations.ts";
-import { type Tier, tierAtLeast } from "../speakers.ts";
 import type { AccessRules, AccessTier } from "./access-policy.ts";
 import { parseIdentity } from "./actor-facts.ts";
 import {
@@ -15,6 +14,7 @@ import {
 	PRINCIPAL_TABLES,
 	PRINCIPALS_CLAIMABLE,
 } from "./principal-tables.ts";
+import { type Tier, tierAtLeast } from "./speakers.ts";
 
 /** Where the backfill finds the ids of people 0.8 stored: the configured owners, then four tables. */
 export type BackfillSource =

package/src/core/identity/identity-service.ts

@@ -1,7 +1,6 @@
 import { ConfigError, IdentityError } from "../domain/errors.ts";
-import type { Logger } from "../log.ts";
-import type { ChannelKey } from "../sessions.ts";
-import { type Speaker, type Tier, tierAtLeast } from "../speakers.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
+import type { Logger } from "../kernel/log.ts";
 import {
 	type AccessRules,
 	checkAccessRules,
@@ -34,6 +33,7 @@ import {
 	SYSTEM_PRINCIPAL,
 } from "./principal-store.ts";
 import { SeenThrottle } from "./seen-throttle.ts";
+import { type Speaker, type Tier, tierAtLeast } from "./speakers.ts";
 import { isPrincipalId, newPrincipalId } from "./ulid.ts";
 
 export type { IdentityService } from "./identity-port.ts";

package/src/core/identity/identity-view.ts

@@ -1,4 +1,4 @@
-import { freeze } from "../freeze.ts";
+import { freeze } from "../kernel/freeze.ts";
 import type { ContactAssessor } from "./contact.ts";
 import type { IdentityService } from "./identity-service.ts";
 

package/src/core/{identity.ts → identity/owner-identity.ts}

@@ -1,4 +1,4 @@
-import type { Pronouns } from "./config/config.ts";
+import type { Pronouns } from "../config/config.ts";
 
 /** Who the agents work for, as prompts and tool descriptions name them. */
 export interface OwnerIdentity {

package/src/core/identity/person-profiles.ts

@@ -1,6 +1,6 @@
 import type { SQL } from "bun";
 import { IdentityError } from "../domain/errors.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 import { ProfileChoices } from "./profile-choices.ts";
 import { cleanName, ExpiringMap } from "./profile-memory.ts";
 import {

package/src/core/identity/plugin-identities.ts

@@ -1,6 +1,6 @@
 import { ConfigError } from "../domain/errors.ts";
-import type { Logger } from "../log.ts";
-import type { PluginIdentity, RoundtablePlugin } from "../plugin.ts";
+import type { Logger } from "../kernel/log.ts";
+import type { PluginIdentity, RoundtablePlugin } from "../plugin-api/plugin.ts";
 import { identityOf, parseIdentity } from "./actor-facts.ts";
 import { type PrincipalStore, SYSTEM_PRINCIPAL } from "./principal-store.ts";
 

package/src/core/identity/principal-reads.ts

@@ -1,6 +1,6 @@
-import { type Speaker, type Tier, tierAtLeast } from "../speakers.ts";
 import { type ActorFacts, identityOf } from "./actor-facts.ts";
 import type { Principal, PrincipalRecord } from "./principal-store.ts";
+import { type Speaker, type Tier, tierAtLeast } from "./speakers.ts";
 
 /** The speaker of a contact: the id the surface knows them by, their 0.8 id where they have one. */
 export const speakerOf = (

package/src/core/identity/principal-store.ts

@@ -1,6 +1,5 @@
 import type { SQL } from "bun";
 import { IdentityError } from "../domain/errors.ts";
-import type { Tier } from "../speakers.ts";
 import type {
 	IdentityLink,
 	IdentityRef,
@@ -13,6 +12,7 @@ import type {
 	RoleHolder,
 	RoleSource,
 } from "./principal-types.ts";
+import type { Tier } from "./speakers.ts";
 import { isPrincipalId, newPrincipalId } from "./ulid.ts";
 
 export type {

package/src/core/identity/principal-types.ts

@@ -1,5 +1,5 @@
 import type { Pronouns } from "../config/config.ts";
-import type { Tier } from "../speakers.ts";
+import type { Tier } from "./speakers.ts";
 
 export type { Pronouns };
 

package/src/core/identity/seen-throttle.ts

@@ -1,4 +1,4 @@
-import type { Tier } from "../speakers.ts";
+import type { Tier } from "./speakers.ts";
 
 /** How often being seen is written for one principal, unless the tier changes. */
 const TOUCH_MS = 5 * 60_000;

package/src/core/{speakers.ts → identity/speakers.ts}

@@ -1,9 +1,6 @@
-import { freeze } from "./freeze.ts";
-import {
-	rulesOfSpeakerMap,
-	speakerPolicyOf,
-} from "./identity/access-policy.ts";
-import type { OwnerIdentity } from "./identity.ts";
+import { freeze } from "../kernel/freeze.ts";
+import { rulesOfSpeakerMap, speakerPolicyOf } from "./access-policy.ts";
+import type { OwnerIdentity } from "./owner-identity.ts";
 
 /** How much a speaker may do: `owner` above `admin` above `member`. */
 export const TIERS = Object.freeze(["member", "admin", "owner"] as const);

package/src/core/images/codex-images-plugin.ts

@@ -1,8 +1,8 @@
 // The codex-images plugin: fills the images slot with drawCodexImage.
 
-import { definePlugin } from "../define.ts";
-import { PluginError } from "../errors.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
+import { PluginError } from "../kernel/errors.ts";
+import { definePlugin } from "../plugin-api/define.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
 import {
 	CODEX_IMAGE_MODEL,
 	CODEX_IMAGES_PROVIDER,

package/src/core/interactions/prompts.ts

@@ -1,6 +1,6 @@
 import type { ConversationVisibility } from "../conversations/conversation-registry.ts";
 import type { TurnRequest } from "../domain/ports.ts";
-import type { Speaker, Tier } from "../speakers.ts";
+import type { Speaker, Tier } from "../identity/speakers.ts";
 import type {
 	AskSupport,
 	OwnerAnswer,

package/src/core/judging/confirmation-judge.ts

@@ -1,6 +1,6 @@
 import type { Judge } from "../contract/providers.ts";
 import type { PendingConfirmation } from "../domain/conversation.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 
 export interface ConfirmationJudgeOptions {
 	judge: Judge;

package/src/core/judging/effort-judge.ts

@@ -1,6 +1,6 @@
 import type { Judge } from "../contract/providers.ts";
-import type { Logger } from "../log.ts";
-import type { ThinkingLevel } from "../models.ts";
+import type { ThinkingLevel } from "../domain/models.ts";
+import type { Logger } from "../kernel/log.ts";
 
 /** The levels the judge chooses between, lowest first; criterion i of a brief asks for level i. */
 export type EffortLevel = "low" | "medium" | "high" | "xhigh";

package/src/core/judging/model-judge.ts

@@ -11,7 +11,7 @@ import type {
 	ScoreQuestion,
 	YesNoQuestion,
 } from "../contract/providers.ts";
-import { JudgeError } from "../errors.ts";
+import { JudgeError } from "../kernel/errors.ts";
 
 /** One completion: a system prompt and a user message in, the model's text out. */
 export type JudgeModel = (system: string, prompt: string) => Promise<string>;

package/src/core/modes/conversation-modes.ts

@@ -1,10 +1,10 @@
 import type { SQL } from "bun";
 import type { Migration } from "../db/migrations.ts";
-import { PluginError } from "../errors.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
 import { SYSTEM_PRINCIPAL } from "../identity/principal-store.ts";
-import type { Logger } from "../log.ts";
-import type { ChannelKey } from "../sessions.ts";
-import type { Speaker } from "../speakers.ts";
+import type { Speaker } from "../identity/speakers.ts";
+import { PluginError } from "../kernel/errors.ts";
+import type { Logger } from "../kernel/log.ts";
 import {
 	followersOf,
 	type ModeOrigins,

package/src/core/modes/mode-inheritance.ts

@@ -1,4 +1,4 @@
-import type { ChannelKey } from "../sessions.ts";
+import type { ChannelKey } from "../domain/sessions.ts";
 import type { ConversationMode } from "./conversation-modes.ts";
 
 /**

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

@@ -1,5 +1,5 @@
-import type { RoundtablePlugin } from "../plugin.ts";
-import { MODES } from "../services.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
+import { MODES } from "../plugin-api/services.ts";
 import { PgConversationModes } from "./conversation-modes.ts";
 
 /** The name of the modes' plugin, as the migration ledger names it. */

package/src/core/modules/background/background-turns.ts

@@ -5,10 +5,11 @@ import type {
 	ScheduledOutcome,
 } from "../../contract/channels.ts";
 import type { ChannelKey } from "../../domain/conversation.ts";
-import type { Logger } from "../../log.ts";
+import type { Logger } from "../../kernel/log.ts";
+import { zonedStamp } from "../../kernel/time.ts";
+import type { BackgroundTurns } from "../../plugin-api/services.ts";
 import { systemTurn } from "../../routing/system-turns.ts";
-import type { BackgroundTurns } from "../../services.ts";
-import { zonedStamp } from "../../time.ts";
+import { PERSONAL_TARGET } from "../../shared/personal-target.ts";
 import {
 	type DelegationJob,
 	type DelegationOutcome,
@@ -17,7 +18,6 @@ import {
 import type { PrecheckFinding } from "../schedules/prechecks.ts";
 import type { Schedule } from "../schedules/schedule-store.ts";
 import { scheduledTurnText } from "../schedules/schedule-tools.ts";
-import { PERSONAL_TARGET } from "./personal-target.ts";
 
 export interface BackgroundTurnsOptions {
 	conversations: Pick<ConversationPort, "background" | "runsAs">;

package/src/core/modules/delegation/delegate.ts

@@ -2,11 +2,11 @@ import type { ExtensionFactory } from "@earendil-works/pi-coding-agent";
 import type { ChannelKey } from "../../domain/conversation.ts";
 import { DelegationError } from "../../domain/errors.ts";
 import { SYSTEM_PRINCIPAL } from "../../identity/principal-store.ts";
+import type { Speaker } from "../../identity/speakers.ts";
+import type { Delegator } from "../../plugin-api/services.ts";
 import { textToolsExtension } from "../../runtime/text-tools.ts";
-import type { Delegator } from "../../services.ts";
 import { DELEGATE_TOOL_SPEC } from "../../shared/delegate-tool.ts";
-import type { Speaker } from "../../speakers.ts";
-import { PERSONAL_TARGET } from "../background/personal-target.ts";
+import { PERSONAL_TARGET } from "../../shared/personal-target.ts";
 
 export interface OwnerDelegation {
 	delegator: Pick<Delegator, "start">;

package/src/core/modules/delegation/delegator.ts

@@ -2,14 +2,14 @@ import type { BackgroundTarget } from "../../contract/channels.ts";
 import type { ChannelKey } from "../../domain/conversation.ts";
 import { DelegationError } from "../../domain/errors.ts";
 import { messages } from "../../i18n/index.ts";
-import type { Logger } from "../../log.ts";
-import type { Delegator } from "../../services.ts";
-import type { Tier } from "../../speakers.ts";
+import type { Tier } from "../../identity/speakers.ts";
+import type { Logger } from "../../kernel/log.ts";
+import { timeZone } from "../../kernel/time.ts";
+import type { Delegator } from "../../plugin-api/services.ts";
 import type {
 	DispatchThread,
 	DispatchThreads,
 } from "../../threads/dispatch-threads.ts";
-import { timeZone } from "../../time.ts";
 
 export interface DelegationJob {
 	id: number;

package/src/core/modules/delegation/web-research-worker.ts

@@ -1,10 +1,10 @@
 import type { ModelRuntime } from "@earendil-works/pi-coding-agent";
-import { PluginError } from "../../errors.ts";
 import {
 	formatModelRef,
 	type ModelRef,
 	type ThinkingLevel,
-} from "../../models.ts";
+} from "../../domain/models.ts";
+import { PluginError } from "../../kernel/errors.ts";
 import { packageDir } from "../../shared/package-dir.ts";
 import { runWorkerSession } from "./worker-session.ts";
 

package/src/core/modules/delegation/worker-session.ts

@@ -7,9 +7,12 @@ import {
 	SessionManager,
 	SettingsManager,
 } from "@earendil-works/pi-coding-agent";
-import type { ThinkingLevel } from "../../models.ts";
+import type { ThinkingLevel } from "../../domain/models.ts";
+import type {
+	WorkerSessionRequest,
+	WorkerSessions,
+} from "../../plugin-api/services.ts";
 import { runWorkerTask } from "../../runtime/worker-task.ts";
-import type { WorkerSessionRequest, WorkerSessions } from "../../services.ts";
 import { activeToolsExtension } from "../../shared/active-tools.ts";
 
 export interface WorkerSessionOptions {

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

@@ -11,7 +11,7 @@ import {
 	type OwnerIdentity,
 	type OwnerWords,
 	ownerWords,
-} from "../../identity.ts";
+} from "../../identity/owner-identity.ts";
 import { textToolsExtension } from "../../runtime/text-tools.ts";
 import type { WorkspaceRoots } from "../../shared/workspace-files.ts";
 

package/src/core/modules/host-shell/shell-policy.ts

@@ -1,5 +1,5 @@
 import { basename } from "node:path";
-import type { HoldContext, HoldRule } from "../../holds.ts";
+import type { HoldContext, HoldRule } from "../../plugin-api/holds.ts";
 import { COMMAND_PREFIX_WORDS, EXPANDED, lexShell } from "./shell-lexer.ts";
 import {
 	bindingCounts,

package/src/core/modules/memory/owner-memory-store.ts

@@ -1,7 +1,7 @@
 import type { SQL } from "bun";
 import type { Migration } from "../../db/migrations.ts";
 import { MemoryError } from "../../domain/errors.ts";
-import type { MemoryStore, SpeakerMemory } from "../../services.ts";
+import type { MemoryStore, SpeakerMemory } from "../../plugin-api/services.ts";
 
 /** The kinds of memory: a core fact shown every turn, a searchable note, a dated event. */
 export const MEMORY_KINDS = Object.freeze(["core", "note", "event"] as const);

package/src/core/modules/memory/owner-memory.ts

@@ -1,10 +1,13 @@
 import type { ExtensionFactory } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { messages } from "../../i18n/index.ts";
-import { addresseeWords, type OwnerIdentity } from "../../identity.ts";
-import type { MemoryStore } from "../../services.ts";
+import {
+	addresseeWords,
+	type OwnerIdentity,
+} from "../../identity/owner-identity.ts";
+import { timeZone, zonedToday } from "../../kernel/time.ts";
+import type { MemoryStore } from "../../plugin-api/services.ts";
 import { toolError, toolText } from "../../shared/tool-result.ts";
-import { timeZone, zonedToday } from "../../time.ts";
 import type { Memory, PromptMemory } from "./owner-memory-store.ts";
 
 function line(memory: Memory): string {

package/src/core/modules/notify/notify.ts

@@ -1,7 +1,10 @@
 import type { ExtensionFactory } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import type { Notifier } from "../../domain/ports.ts";
-import { addresseeWords, type OwnerIdentity } from "../../identity.ts";
+import {
+	addresseeWords,
+	type OwnerIdentity,
+} from "../../identity/owner-identity.ts";
 import { toolError, toolText } from "../../shared/tool-result.ts";
 
 /** What notify needs in one session. */

package/src/core/modules/notify/session-notify.ts

@@ -1,14 +1,14 @@
 import type { ExtensionFactory } from "@earendil-works/pi-coding-agent";
 import type { ChannelKey } from "../../domain/conversation.ts";
+import type { SessionContext } from "../../domain/sessions.ts";
+import type { OwnerIdentity } from "../../identity/owner-identity.ts";
 import { SYSTEM_PRINCIPAL } from "../../identity/principal-store.ts";
-import type { OwnerIdentity } from "../../identity.ts";
-import type { Logger } from "../../log.ts";
+import type { Logger } from "../../kernel/log.ts";
 import { providerSurface, surfaceOf } from "../../presence/delivery-router.ts";
 import type {
 	DirectChannelProvider,
 	DirectChannels,
 } from "../../presence/direct-channels.ts";
-import type { SessionContext } from "../../sessions.ts";
 import { notifyExtension } from "./notify.ts";
 
 export interface SessionNotifyDeps {

package/src/core/modules/prompts/prompt-documents.ts

@@ -2,7 +2,7 @@ import type { SQL } from "bun";
 import { isCheckDatabase } from "../../db/check-database.ts";
 import type { Migration } from "../../db/migrations.ts";
 import { AgentError } from "../../domain/errors.ts";
-import { type Logger, silentLogger } from "../../log.ts";
+import { type Logger, silentLogger } from "../../kernel/log.ts";
 import {
 	PromptHistory,
 	type PromptVersion,