pi-roundtable 0.34.0 → 0.35.0

package/src/core/runtime/ask-questions.ts

@@ -1,5 +1,5 @@
 import { messages } from "../i18n/index.ts";
-import type { OwnerIdentity } from "../identity.ts";
+import type { OwnerIdentity } from "../identity/owner-identity.ts";
 import type { OwnerAnswer, Prompts } from "../interactions/prompts.ts";
 import {
 	type Questionnaire,

package/src/core/runtime/bridge-guard.ts

@@ -6,16 +6,16 @@ import type {
 } from "@earendil-works/pi-coding-agent";
 import type { AgentSessions } from "../contract/runtime.ts";
 import { AgentRunError, ConfigError } from "../domain/errors.ts";
-import type { AccessRules, AccessTier } from "../identity/access-policy.ts";
-import type { IdentityService } from "../identity/identity-service.ts";
-import { SYSTEM_PRINCIPAL } from "../identity/principal-store.ts";
 import {
 	formatModelRef,
 	type ModelRef,
 	parseModelRef,
 	type ThinkingSetting,
-} from "../models.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
+} from "../domain/models.ts";
+import type { AccessRules, AccessTier } from "../identity/access-policy.ts";
+import type { IdentityService } from "../identity/identity-service.ts";
+import { SYSTEM_PRINCIPAL } from "../identity/principal-store.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
 import { guardHidesPrivateExchange } from "./extensions/private-memory.ts";
 import { bridgeHistoryHidesMemoryFor } from "./reader-history.ts";
 

package/src/core/runtime/chat-only.ts

@@ -1,6 +1,6 @@
 import { ConfigError } from "../domain/errors.ts";
 import { SHELL_TOOLS } from "../modules/host-shell/shell-policy.ts";
-import type { RoundtablePlugin } from "../plugin.ts";
+import type { RoundtablePlugin } from "../plugin-api/plugin.ts";
 
 const CHAT_ONLY = 'agentServer: { tools: "chat-only" }';
 

package/src/core/runtime/conversation-sessions.ts

@@ -5,9 +5,8 @@ import type {
 	ChannelKey,
 	PendingConfirmation,
 } from "../domain/conversation.ts";
+import type { ThinkingLevel } from "../domain/models.ts";
 import type { TurnConversation, TurnRequest } from "../domain/ports.ts";
-import type { ThinkingLevel } from "../models.ts";
-import type { ToolTiers } from "../tool-tiers.ts";
 import { ConfirmationGate, unexpired } from "./extensions/confirmation-gate.ts";
 import { PromptSlot } from "./prompt-slot.ts";
 import type { ChannelSession, PiAgentRuntimeOptions } from "./runtime-types.ts";
@@ -23,6 +22,7 @@ import {
 	historyScope,
 	scopedHistory,
 } from "./session-scope.ts";
+import type { ToolTiers } from "./tool-tiers.ts";
 
 type AgentMessage = AgentSession["messages"][number];
 

package/src/core/runtime/extensions/agent-prompt.ts

@@ -1,5 +1,5 @@
 import type { ExtensionFactory } from "@earendil-works/pi-coding-agent";
-import type { Logger } from "../../log.ts";
+import type { Logger } from "../../kernel/log.ts";
 import { readPromptOrStop } from "./prompt-read.ts";
 
 /**

package/src/core/runtime/extensions/ask-user-text.ts

@@ -1,4 +1,8 @@
-import { type OwnerIdentity, ownerWords, PRONOUNS } from "../../identity.ts";
+import {
+	type OwnerIdentity,
+	ownerWords,
+	PRONOUNS,
+} from "../../identity/owner-identity.ts";
 import type {
 	OwnerAnswer,
 	OwnerQuestion,

package/src/core/runtime/extensions/ask-user.ts

@@ -1,6 +1,9 @@
 import type { ExtensionFactory } from "@earendil-works/pi-coding-agent";
 import { type Static, Type } from "typebox";
-import { type OwnerIdentity, ownerWords } from "../../identity.ts";
+import {
+	type OwnerIdentity,
+	ownerWords,
+} from "../../identity/owner-identity.ts";
 import type { OwnerQuestion } from "../../interactions/prompts.ts";
 import { QUESTIONNAIRE_LIMITS as L } from "../../interactions/questionnaire.ts";
 import { DEFAULT_YOLO_QUESTION_GRACE_MS } from "../../modes/autonomy.ts";

package/src/core/runtime/extensions/card-ask.ts

@@ -1,3 +1,4 @@
+import type { Tier } from "../../identity/speakers.ts";
 import type {
 	Approval,
 	ApprovalDetails,
@@ -6,7 +7,6 @@ import type {
 	Prompts,
 	PromptWait,
 } from "../../interactions/prompts.ts";
-import type { Tier } from "../../speakers.ts";
 import type { Watch } from "./withdrawals.ts";
 
 /** What a held call's card is opened with. */

package/src/core/runtime/extensions/confirmation-fixture.ts

@@ -1,4 +1,4 @@
-import type { HoldRule } from "../../holds.ts";
+import type { HoldRule } from "../../plugin-api/holds.ts";
 
 /** A tool that waits for the owner's confirmation in the gate's tests. */
 export const MAIL = "send-mail";

package/src/core/runtime/extensions/confirmation-gate-extension.ts

@@ -1,5 +1,5 @@
 import type { ExtensionFactory } from "@earendil-works/pi-coding-agent";
-import type { ToolTurn } from "../../define.ts";
+import type { ToolTurn } from "../../plugin-api/define.ts";
 import type { PromptSlot } from "../prompt-slot.ts";
 import type { ConfirmationGate, HoldTurn } from "./confirmation-gate.ts";
 

package/src/core/runtime/extensions/confirmation-gate.ts

@@ -2,17 +2,17 @@ import type {
 	HeldCall,
 	PendingConfirmation,
 } from "../../domain/conversation.ts";
+import { messages } from "../../i18n/index.ts";
+import type { OwnerIdentity } from "../../identity/owner-identity.ts";
+import type { ApprovedBy, Prompts } from "../../interactions/prompts.ts";
 import {
 	HOLD_DESCRIBE_TIMEOUT_MS,
 	type HoldCheck,
 	type HoldContext,
 	higherTier,
 	isPromise,
-} from "../../holds.ts";
-import { messages } from "../../i18n/index.ts";
-import type { OwnerIdentity } from "../../identity.ts";
-import type { ApprovedBy, Prompts } from "../../interactions/prompts.ts";
-import type { ToolTiers } from "../../tool-tiers.ts";
+} from "../../plugin-api/holds.ts";
+import type { ToolTiers } from "../tool-tiers.ts";
 import { approvalCard, approvalDetails } from "./approval-card.ts";
 import { askOnCard } from "./card-ask.ts";
 import {

package/src/core/runtime/extensions/gate-refusals.ts

@@ -3,12 +3,15 @@ import type {
 	PendingConfirmation,
 } from "../../domain/conversation.ts";
 import type { HoldRefusal } from "../../domain/progress.ts";
-import { type OwnerIdentity, ownerWords } from "../../identity.ts";
+import {
+	type OwnerIdentity,
+	ownerWords,
+} from "../../identity/owner-identity.ts";
+import type { Speaker } from "../../identity/speakers.ts";
 import type {
 	ApprovalDetails,
 	ApprovedBy,
 } from "../../interactions/prompts.ts";
-import type { Speaker } from "../../speakers.ts";
 import { mayApproveNamed } from "./held-calls.ts";
 
 /**

package/src/core/runtime/extensions/held-calls.ts

@@ -2,9 +2,9 @@ import type {
 	HeldCall,
 	PendingConfirmation,
 } from "../../domain/conversation.ts";
-import type { OwnerIdentity } from "../../identity.ts";
+import type { OwnerIdentity } from "../../identity/owner-identity.ts";
+import type { Speaker } from "../../identity/speakers.ts";
 import type { ApprovedBy } from "../../interactions/prompts.ts";
-import type { Speaker } from "../../speakers.ts";
 
 /** Held actions older than this cannot be approved any more. */
 export const CONFIRMATION_TTL_MS = 24 * 3_600_000;

package/src/core/runtime/extensions/hold-describer.ts

@@ -1,12 +1,12 @@
-import type { ToolTurn } from "../../define.ts";
+import { messages } from "../../i18n/index.ts";
+import type { ToolTurn } from "../../plugin-api/define.ts";
 import {
 	type ClassedHold,
 	type HoldCheck,
 	type HoldContext,
 	type HoldDescription,
 	isPromise,
-} from "../../holds.ts";
-import { messages } from "../../i18n/index.ts";
+} from "../../plugin-api/holds.ts";
 import {
 	awaited,
 	type Described,

package/src/core/runtime/extensions/hold-lookups.ts

@@ -1,13 +1,13 @@
-import type { ToolTurn } from "../../define.ts";
 import type { HeldCall } from "../../domain/conversation.ts";
+import { messages } from "../../i18n/index.ts";
+import type { ApprovalDetails } from "../../interactions/prompts.ts";
+import type { ToolTurn } from "../../plugin-api/define.ts";
 import {
 	type HoldCheck,
 	type HoldContext,
 	type HoldDescription,
 	isPromise,
-} from "../../holds.ts";
-import { messages } from "../../i18n/index.ts";
-import type { ApprovalDetails } from "../../interactions/prompts.ts";
+} from "../../plugin-api/holds.ts";
 import { canonicalJson } from "./held-calls.ts";
 
 /** The turn a hold that looks things up sees; see `HoldRule.describeInTurn`. */

package/src/core/runtime/extensions/persona-prompt.ts

@@ -1,5 +1,5 @@
 import type { ExtensionFactory } from "@earendil-works/pi-coding-agent";
-import type { Logger } from "../../log.ts";
+import type { Logger } from "../../kernel/log.ts";
 import { readPromptOrStop } from "./prompt-read.ts";
 
 /**

package/src/core/runtime/extensions/prompt-read.ts

@@ -1,4 +1,4 @@
-import type { Logger } from "../../log.ts";
+import type { Logger } from "../../kernel/log.ts";
 
 /**
  * Reads a prompt for the run that is starting. Pi swallows what a `before_agent_start` handler

package/src/core/runtime/extensions/yolo.ts

@@ -1,11 +1,11 @@
 import type { HeldCall } from "../../domain/conversation.ts";
 import type { TurnRequest } from "../../domain/ports.ts";
+import type { ChannelKey } from "../../domain/sessions.ts";
 import { SYSTEM_PRINCIPAL } from "../../identity/principal-store.ts";
 import type { ApprovedBy } from "../../interactions/prompts.ts";
 import { type Autonomy, DEFAULT_AUTONOMY } from "../../modes/autonomy.ts";
 import type { ConversationModes } from "../../modes/conversation-modes.ts";
 import { YOLO_CARDED_SHELL_CLASSES } from "../../modules/host-shell/shell-policy.ts";
-import type { ChannelKey } from "../../sessions.ts";
 import type { PiAgentRuntimeOptions } from "../runtime-types.ts";
 import type { AutoApprover } from "./confirmation-gate.ts";
 import type { SpeakerRef } from "./gate-refusals.ts";

package/src/core/runtime/interim-text.ts

@@ -1,6 +1,6 @@
 import type { InterimMessage, InterimPosts } from "../domain/interim.ts";
 import type { TurnRequest } from "../domain/ports.ts";
-import type { Logger } from "../log.ts";
+import type { Logger } from "../kernel/log.ts";
 import {
 	DISCORD_MESSAGE_LIMIT,
 	splitReply,

package/src/core/runtime/pi-agent-runtime.ts

@@ -18,12 +18,11 @@ import type {
 } from "../domain/conversation.ts";
 import { AgentRunError } from "../domain/errors.ts";
 import type { TurnRequest } from "../domain/ports.ts";
-import { HostStoppingError } from "../errors.ts";
+import type { TransientTask } from "../domain/sessions.ts";
 import { assistantName } from "../i18n/index.ts";
 import { promptScopeOf } from "../interactions/prompts.ts";
-import { withoutReplyFiles } from "../reply-files.ts";
-import type { TransientTask } from "../sessions.ts";
-import { type ToolTiers, toolTiers } from "../tool-tiers.ts";
+import { HostStoppingError } from "../kernel/errors.ts";
+import { withoutReplyFiles } from "../shared/reply-files.ts";
 import { AbortGuard } from "./abort-guard.ts";
 import { bridgeTurnRefusal, chosenAgentModel } from "./bridge-guard.ts";
 import { ConversationSessions } from "./conversation-sessions.ts";
@@ -47,6 +46,7 @@ import { SessionFactory } from "./session-factory.ts";
 import { promptImages, SteerableRun } from "./steerable-run.ts";
 import { thinkingLevel } from "./thinking-level.ts";
 import { runningCalls } from "./tool-call-scope.ts";
+import { type ToolTiers, toolTiers } from "./tool-tiers.ts";
 import { transcriptOf, turnAnswer, unspokenTurn } from "./turn-answer.ts";
 import type { TurnBudget } from "./turn-budget.ts";
 import { promptFailed, turnLimits } from "./turn-limits.ts";

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

@@ -1,6 +1,6 @@
 import type { ClientPort } from "../domain/client.ts";
 import type { TurnRequest } from "../domain/ports.ts";
-import type { Speaker, Tier } from "../speakers.ts";
+import type { Speaker, Tier } from "../identity/speakers.ts";
 
 /** What the runtime keeps about a conversation's running turn, for its tools to read. */
 export interface RunningTurn {

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

@@ -7,20 +7,25 @@ import type {
 } from "../contract/runtime.ts";
 import type { ChannelKey } from "../domain/conversation.ts";
 import type { InterimTextMode } from "../domain/interim.ts";
-import type { IdentityService } from "../identity/identity-service.ts";
-import type { OwnerIdentity } from "../identity.ts";
-import type { PromptScope } from "../interactions/prompts.ts";
-import { AGENT_BRIEF, EffortJudge } from "../judging/effort-judge.ts";
 import {
 	type EffortPolicy,
 	formatModelRef,
 	type ModelRef,
 	type ThinkingLevel,
-} from "../models.ts";
+} from "../domain/models.ts";
+import type { IdentityService } from "../identity/identity-service.ts";
+import type { OwnerIdentity } from "../identity/owner-identity.ts";
+import type { Speaker } from "../identity/speakers.ts";
+import type { PromptScope } from "../interactions/prompts.ts";
+import { AGENT_BRIEF, EffortJudge } from "../judging/effort-judge.ts";
 import type { Autonomy } from "../modes/autonomy.ts";
-import type { PluginContext, RoundtablePlugin } from "../plugin.ts";
-import { CONVERSATIONS, IDENTITY, MODES, RUNTIME } from "../services.ts";
-import type { Speaker } from "../speakers.ts";
+import type { PluginContext, RoundtablePlugin } from "../plugin-api/plugin.ts";
+import {
+	CONVERSATIONS,
+	IDENTITY,
+	MODES,
+	RUNTIME,
+} from "../plugin-api/services.ts";
 import {
 	BRIDGE_MEMORY_FIX,
 	bridgeMemoryProblem,

package/src/core/runtime/runtime-types.ts

@@ -8,28 +8,32 @@ import type { ImageDrawer } from "../contract/providers.ts";
 import type { AgentSessions, LoadedSkill } from "../contract/runtime.ts";
 import type { ChannelKey } from "../domain/conversation.ts";
 import type { InterimTextMode } from "../domain/interim.ts";
+import type {
+	EffortPolicy,
+	ThinkingLevel,
+	ThinkingPicker,
+} from "../domain/models.ts";
 import type { TurnConversation } from "../domain/ports.ts";
-import type { Principal } from "../identity/principal-store.ts";
-import type { OwnerIdentity } from "../identity.ts";
-import type { PromptScope, Prompts } from "../interactions/prompts.ts";
-import type { Logger } from "../log.ts";
-import type { EffortPolicy, ThinkingLevel, ThinkingPicker } from "../models.ts";
-import type { Autonomy } from "../modes/autonomy.ts";
-import type { ConversationModes } from "../modes/conversation-modes.ts";
-import type { AgentTools, LinkedSessions } from "../plugin.ts";
 import {
 	planOrder,
 	type SessionContext,
 	type SessionConversation,
 	type SessionPlan,
 	type SessionTool,
-} from "../sessions.ts";
+} from "../domain/sessions.ts";
+import type { OwnerIdentity } from "../identity/owner-identity.ts";
+import type { Principal } from "../identity/principal-store.ts";
+import type { PromptScope, Prompts } from "../interactions/prompts.ts";
+import type { Logger } from "../kernel/log.ts";
+import type { Autonomy } from "../modes/autonomy.ts";
+import type { ConversationModes } from "../modes/conversation-modes.ts";
+import type { AgentTools, LinkedSessions } from "../plugin-api/plugin.ts";
 import type { ShellEnv } from "../shared/child-env.ts";
 import { secretMaskExtension } from "../shared/secret-mask.ts";
-import type { ToolTiers } from "../tool-tiers.ts";
 import type { MemoryDraws } from "./extensions/private-memory.ts";
 import type { PendingConfirmationStore } from "./pending-confirmation-store.ts";
 import { scopedCalls } from "./tool-call-scope.ts";
+import type { ToolTiers } from "./tool-tiers.ts";
 
 export type TurnMessage = Extract<
 	AgentSessionEvent,

package/src/core/runtime/session-conversation.ts

@@ -1,12 +1,12 @@
 import type { ChannelKey } from "../domain/conversation.ts";
 import type { TurnConversation, TurnRequest } from "../domain/ports.ts";
+import type { SessionConversation } from "../domain/sessions.ts";
+import { addresseeOf, type OwnerIdentity } from "../identity/owner-identity.ts";
 import {
 	type Principal,
 	SYSTEM_PRINCIPAL,
 } from "../identity/principal-store.ts";
-import { addresseeOf, type OwnerIdentity } from "../identity.ts";
-import type { SessionConversation } from "../sessions.ts";
-import { addressee, type Speaker, THE_SPEAKER } from "../speakers.ts";
+import { addressee, type Speaker, THE_SPEAKER } from "../identity/speakers.ts";
 import type { PiAgentRuntimeOptions } from "./runtime-types.ts";
 
 /**

package/src/core/runtime/session-factory.ts

@@ -12,7 +12,6 @@ import type { ClientPort } from "../domain/client.ts";
 import type { ChannelKey } from "../domain/conversation.ts";
 import { ConfigError } from "../domain/errors.ts";
 import type { AgentTurnScope } from "../domain/ports.ts";
-import type { LinkedSessions } from "../plugin.ts";
 import {
 	planOrder,
 	type SessionContext,
@@ -20,7 +19,10 @@ import {
 	type SessionPlan,
 	type ToolSelection,
 	type TransientTask,
-} from "../sessions.ts";
+} from "../domain/sessions.ts";
+import { type Speaker, THE_SPEAKER } from "../identity/speakers.ts";
+import type { LinkedSessions } from "../plugin-api/plugin.ts";
+import { toolTurn } from "../plugin-api/tool-turn.ts";
 import { activeToolsExtension } from "../shared/active-tools.ts";
 import {
 	ATTACH_FILE_TOOL,
@@ -29,9 +31,6 @@ import {
 import { GENERATE_IMAGE_TOOL } from "../shared/generate-image-tool.ts";
 import { packageDir } from "../shared/package-dir.ts";
 import { readAttachmentExtension } from "../shared/read-attachment-tool.ts";
-import { type Speaker, THE_SPEAKER } from "../speakers.ts";
-import { currentToolNames } from "../tool-tiers.ts";
-import { toolTurn } from "../tool-turn.ts";
 import { refuseShellTools } from "./chat-only.ts";
 import {
 	CompactionTiers,
@@ -72,6 +71,7 @@ import {
 	turnAddressee,
 } from "./session-conversation.ts";
 import { imageTools, scratchBash } from "./session-helpers.ts";
+import { currentToolNames } from "./tool-tiers.ts";
 
 export { imageTools, scratchBash };
 

package/src/core/runtime/thinking-level.ts

@@ -3,12 +3,12 @@ import type {
 	ModelRuntime,
 } from "@earendil-works/pi-coding-agent";
 import type { ChannelKey } from "../domain/conversation.ts";
-import type { TurnRequest } from "../domain/ports.ts";
 import {
 	AUTO_THINKING,
 	type EffortPolicy,
 	type ThinkingLevel,
-} from "../models.ts";
+} from "../domain/models.ts";
+import type { TurnRequest } from "../domain/ports.ts";
 import {
 	type AgentModelSettings,
 	useChosenAgentModel,

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