pi-roundtable 0.1.0 → 0.2.1

package/src/core/i18n/index.ts

@@ -2,8 +2,6 @@ import { createEn, type Messages } from "./en.ts";
 import type { CatalogContext } from "./types.ts";
 import { createZhTW } from "./zh-tw.ts";
 
-export type { CatalogContext } from "./types.ts";
-
 export type { Messages };
 
 export type Locale = "en" | "zh-TW";
@@ -35,6 +33,17 @@ function build(locale: Locale, settings: LocaleSettings): Messages {
 
 let active: Messages = build("en", DEFAULTS);
 let names: CatalogContext = DEFAULTS;
+let current: Locale = "en";
+
+/** The catalog of a locale, apart from the process's own; for text that names its locale itself. */
+export function catalogFor(locale: Locale): Messages {
+	return build(locale, DEFAULTS);
+}
+
+/** The locale `setLocale` chose. */
+export function activeLocale(): Locale {
+	return current;
+}
 
 /**
  * Chooses the catalog of Discord text for the whole process; the host calls it once at startup,
@@ -44,6 +53,7 @@ let names: CatalogContext = DEFAULTS;
 export function setLocale(locale: Locale, settings: LocaleSettings): void {
 	if (!isLocale(locale)) throw new Error(`Unknown locale: ${String(locale)}`);
 	active = build(locale, settings);
+	current = locale;
 	names = { assistant: settings.assistant, root: settings.root };
 }
 

package/src/core/i18n/owner.ts

@@ -13,6 +13,9 @@ export function ownerEn(ctx: CatalogContext) {
 		surfaceActionFailed: "Sorry, that action did not work.",
 		stopNote: "-# Working; press Stop to interrupt.",
 		stopLabel: "Stop",
+		stopDone: "Stopped.",
+		stopIdle: "Nothing is running right now.",
+		stopOwnerOnly: `Only ${ctx.assistant}'s owner can stop it.`,
 		panelPage: (title: string, page: number, pages: number) =>
 			`${title} (${page}/${pages})`,
 	};
@@ -25,10 +28,13 @@ export function ownerZhTW(ctx: CatalogContext): ReturnType<typeof ownerEn> {
 		ownerErrorTitle: "出了點問題",
 		ownerErrorBody: "這次沒能完成，請稍後再試；細節已經記在 log 裡。",
 		ownerRefusalTitle: "只有擁有者能用",
-		ownerRefusalBody: `\`/${ctx.root}\` 是 ${ctx.assistant} 擁有者的控制台。擲骰請用 \`/roll\` 或 \`/dice\`。`,
+		ownerRefusalBody: `\`/${ctx.root}\` 是 ${ctx.assistant} 擁有者的控制台。`,
 		surfaceActionFailed: "抱歉，這個操作沒有成功。",
 		stopNote: "-# 工作中，想中斷就按停止。",
 		stopLabel: "停止",
+		stopDone: "已停止。",
+		stopIdle: "現在沒有進行中的工作。",
+		stopOwnerOnly: `只有 ${ctx.assistant} 的擁有者能停止。`,
 		panelPage: (title: string, page: number, pages: number) =>
 			`${title}（${page}/${pages}）`,
 	};

package/src/core/i18n/schedules.ts

@@ -30,10 +30,13 @@ export function schedulesEn(ctx: CatalogContext) {
 			`Every ${days} days at ${time} (counting from ${startDate})`,
 		scheduleWeekly: (days: readonly string[], time: string) =>
 			`Weekly on ${days.join(", ")} at ${time}`,
-		scheduleHead: (id: number, title: string, channel: string, mode: string) =>
-			`**#${id} ${title}** · ${channel} · ${mode}`,
+		scheduleHead: (
+			id: number,
+			title: string,
+			channel: string,
+			target: string,
+		) => `**#${id} ${title}** · ${channel} · ${target}`,
 		scheduleModeOwner: ctx.assistant,
-		scheduleModeParty: "party role",
 		scheduleFooter: `Schedules are created and edited by the bot in conversation; here you can review and cancel them. \`/${ctx.root} schedule cancel\` cancels one.`,
 		scheduleGroupDescription: "Schedules",
 		scheduleListDescription: "List the schedules of every channel",
@@ -66,10 +69,13 @@ export function schedulesZhTW(
 			`每 ${days} 天 ${time}（從 ${startDate} 起算）`,
 		scheduleWeekly: (days: readonly string[], time: string) =>
 			`每週${days.join("、")} ${time}`,
-		scheduleHead: (id: number, title: string, channel: string, mode: string) =>
-			`**#${id} ${title}**　${channel}　${mode}`,
+		scheduleHead: (
+			id: number,
+			title: string,
+			channel: string,
+			target: string,
+		) => `**#${id} ${title}**　${channel}　${target}`,
 		scheduleModeOwner: ctx.assistant,
-		scheduleModeParty: "party 角色",
 		scheduleFooter: `排程由 bot 在對話中建立與修改；這裡可以總覽與取消。\`/${ctx.root} schedule cancel\` 取消。`,
 		scheduleGroupDescription: "排程",
 		scheduleListDescription: "列出所有頻道的排程",

package/src/core/identity.ts

@@ -1,7 +1,7 @@
 /** Who the agents work for, as prompts and tool descriptions name them. */
 export interface OwnerIdentity {
 	name: string;
-	/** How prompts refer back to the owner, such as he, him, his. */
+	/** How prompts refer back to the owner, such as they, them, their. */
 	pronouns: { subject: string; object: string; possessive: string };
 }
 

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

@@ -3,8 +3,13 @@ import type { Logger } from "../log.ts";
 import type { ThinkingLevel } from "../models.ts";
 
 /** The levels the judge chooses between, lowest first; criterion i of a brief asks for level i. */
-export const EFFORT_LEVELS = ["low", "medium", "high", "xhigh"] as const;
-export type EffortLevel = (typeof EFFORT_LEVELS)[number];
+export type EffortLevel = "low" | "medium" | "high" | "xhigh";
+const EFFORT_LEVELS: readonly EffortLevel[] = [
+	"low",
+	"medium",
+	"high",
+	"xhigh",
+];
 
 /** What the judge is told about the conversation, and one criterion per effort level. */
 export interface EffortBrief {
@@ -62,8 +67,25 @@ export interface PreviousTurn<Level extends ThinkingLevel> {
 	level?: Level;
 }
 
+/** Picks the thinking level of one turn from a message and what the previous turn left. */
+export interface EffortPicker<Fallback extends ThinkingLevel = ThinkingLevel> {
+	judge(
+		message: string,
+		previous?: PreviousTurn<EffortLevel | Fallback>,
+	): Promise<EffortLevel | Fallback>;
+}
+
+/** The judge of a conversation's turns, reading each message against the brief. */
+export function effortJudge<Fallback extends ThinkingLevel>(
+	options: EffortJudgeOptions<Fallback>,
+): EffortPicker<Fallback> {
+	return new EffortJudge(options);
+}
+
 /** Picks the thinking level of one turn from the judge's reading of its message. */
-export class EffortJudge<Fallback extends ThinkingLevel = ThinkingLevel> {
+export class EffortJudge<Fallback extends ThinkingLevel = ThinkingLevel>
+	implements EffortPicker<Fallback>
+{
 	readonly #options: EffortJudgeOptions<Fallback>;
 
 	constructor(options: EffortJudgeOptions<Fallback>) {

package/src/core/log.ts

@@ -1,6 +1,24 @@
-import pino, { type Logger } from "pino";
+import pino from "pino";
 
-export type { Logger };
+/** One log method: fields and a message, or a message alone. */
+export interface LogFn {
+	(fields: object, message?: string): void;
+	(message: string): void;
+}
+
+/**
+ * The logger a plugin writes to. pino satisfies it, so a process that already has a pino logger
+ * hands it over as it is.
+ */
+export interface Logger {
+	debug: LogFn;
+	info: LogFn;
+	warn: LogFn;
+	error: LogFn;
+	fatal: LogFn;
+	/** A logger that adds these fields to every line it writes. */
+	child(fields: Record<string, unknown>): Logger;
+}
 
 /** One log line as pino writes it: `level`, `time`, `msg`, `err`, and the logged fields. */
 export type LogEntry = Record<string, unknown>;
@@ -12,7 +30,7 @@ export type LogEntry = Record<string, unknown>;
 export function createLogger(
 	app: string,
 	onError?: (entry: LogEntry) => void,
-): Logger {
+): pino.Logger {
 	const options = {
 		base: { app },
 		level: process.env.LOG_LEVEL ?? "info",

package/src/core/models.ts

@@ -9,14 +9,14 @@ export type ThinkingLevel =
 	| "high"
 	| "xhigh";
 
-export const THINKING_LEVELS: readonly ThinkingLevel[] = [
+export const THINKING_LEVELS: readonly ThinkingLevel[] = Object.freeze([
 	"off",
 	"minimal",
 	"low",
 	"medium",
 	"high",
 	"xhigh",
-];
+]);
 
 /** An agent's or the assistant's thinking setting: a fixed level, or the judge's choice each turn. */
 export const AUTO_THINKING = "auto";

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

@@ -1,9 +1,11 @@
+import { OWNER_TARGET } from "../../agents/agent-claim.ts";
 import type {
 	ConversationPort,
 	ScheduledOutcome,
 } from "../../contract/channels.ts";
 import type { ChannelKey } from "../../domain/conversation.ts";
 import type { Logger } from "../../log.ts";
+import type { BackgroundTurns } from "../../services.ts";
 import { zonedStamp } from "../../time.ts";
 import {
 	type DelegationJob,
@@ -24,7 +26,7 @@ export interface BackgroundTurnsOptions {
  * Turns nobody wrote, each answered in its channel by the claim that owns it: a due schedule's,
  * a delegated task's report, and the process's own logged error.
  */
-export class BackgroundTurns {
+export class ConversationBackgroundTurns implements BackgroundTurns {
 	readonly #options: BackgroundTurnsOptions;
 
 	constructor(options: BackgroundTurnsOptions) {
@@ -35,7 +37,7 @@ export class BackgroundTurns {
 	runScheduled(schedule: Schedule, firedAt: Date): Promise<ScheduledOutcome> {
 		return this.#options.conversations.background({
 			channel: schedule.channel,
-			mode: schedule.mode,
+			target: schedule.target,
 			author: { id: schedule.createdById, name: schedule.createdByName },
 			tier: schedule.createdTier,
 			turnId: `schedule-${schedule.id}-${firedAt.getTime()}`,
@@ -50,7 +52,7 @@ export class BackgroundTurns {
 	): Promise<void> {
 		const outcome = await this.#options.conversations.background({
 			channel: job.channel,
-			mode: job.mode,
+			target: job.target,
 			author: job.author,
 			...(job.author.tier ? { tier: job.author.tier } : {}),
 			turnId: `delegate-${job.id}-${job.startedAt.getTime()}`,
@@ -68,7 +70,7 @@ export class BackgroundTurns {
 	runErrorReport(channel: ChannelKey, text: string): Promise<ScheduledOutcome> {
 		return this.#options.conversations.background({
 			channel,
-			mode: "owner",
+			target: OWNER_TARGET.name,
 			author: this.#options.system,
 			turnId: `error-${Date.now()}`,
 			text,

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

@@ -1,11 +1,12 @@
 import type { ExtensionFactory } from "@earendil-works/pi-coding-agent";
+import { OWNER_TARGET } from "../../agents/agent-claim.ts";
 import type { ChannelKey } from "../../domain/conversation.ts";
 import { DelegationError } from "../../domain/errors.ts";
 import type { OwnerIdentity } from "../../identity.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 type { Delegator } from "./delegator.ts";
 
 export interface OwnerDelegation {
 	delegator: Pick<Delegator, "start">;
@@ -36,7 +37,7 @@ export function delegateExtension(
 					const job = delegation.delegator.start({
 						channel: target,
 						origin,
-						mode: "owner",
+						target: OWNER_TARGET.name,
 						author: speaker() ?? delegation.owner,
 						title,
 						task,

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

@@ -1,3 +1,4 @@
+import type { BackgroundTarget } from "../../contract/channels.ts";
 import type {
 	DispatchThread,
 	DispatchThreads,
@@ -6,19 +7,19 @@ 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 { timeZone } from "../../time.ts";
 
-export type DelegationMode = "owner" | "party";
-
 export interface DelegationJob {
 	id: number;
 	/** Where the report comes back as a turn. */
 	channel: ChannelKey;
-	/** The channel of the owner's turn that started it, which hosts its thread; party jobs have none. */
+	/** The channel of the owner's turn that started it, which hosts its thread; absent where no thread opens. */
 	origin?: ChannelKey;
-	mode: DelegationMode;
-	/** Who asked; a party report is answered as this person's turn. */
+	/** The name of the background target the report is answered as. */
+	target: string;
+	/** Who asked; the report is answered as this person's turn. */
 	author: { id: string; name: string; tier?: Tier };
 	title: string;
 	task: string;
@@ -37,6 +38,8 @@ export interface DelegationWorker {
 
 export interface DelegatorOptions {
 	worker: DelegationWorker;
+	/** Resolves a job's target; an unknown one, or one without `delegation`, is refused with a DelegationError. */
+	targets(name: string): BackgroundTarget | undefined;
 	/** Posts the finished job back in its channel; never rejects. */
 	deliver: (job: DelegationJob, outcome: DelegationOutcome) => Promise<void>;
 	/** Each job's thread in its origin; without it every job reports in its channel only. */
@@ -46,17 +49,12 @@ export interface DelegatorOptions {
 }
 
 const MAX_TASK_CHARS = 4_000;
-/** Jobs one channel may have running at once. */
-const RUNNING_LIMIT: Readonly<Record<DelegationMode, number>> = {
-	owner: 3,
-	party: 2,
-};
 
 /**
  * Runs delegated tasks in the background and hands each result back to its channel. Jobs live
  * in memory: a restart drops the running ones, and the channel never hears back from them.
  */
-export class Delegator {
+export class DefaultDelegator implements Delegator {
 	readonly #options: DelegatorOptions;
 	readonly #running = new Map<
 		number,
@@ -83,7 +81,11 @@ export class Delegator {
 		const busy = [...this.#running.values()].filter(
 			({ job }) => job.channel === request.channel,
 		).length;
-		const limit = RUNNING_LIMIT[request.mode];
+		const limit = this.#options.targets(request.target)?.delegation?.maxRunning;
+		if (limit === undefined)
+			throw new DelegationError(
+				`delegated tasks are not available for ${request.target} conversations`,
+			);
 		if (busy >= limit)
 			throw new DelegationError(
 				`this channel already has ${busy} delegated tasks running; wait for one to report back`,
@@ -119,7 +121,7 @@ export class Delegator {
 			timeoutMs = 20 * 60_000,
 		} = this.#options;
 		logger.info(
-			{ job: job.id, channel: job.channel, mode: job.mode },
+			{ job: job.id, channel: job.channel, target: job.target },
 			"delegated task started",
 		);
 		const thread = await threads?.open(

package/src/core/modules/delegation/{sol-worker.ts → web-research-worker.ts}

@@ -12,15 +12,15 @@ import {
 	type ThinkingLevel,
 } from "../../models.ts";
 import { runWorkerTask } from "../../runtime/worker-task.ts";
+import { activeToolsExtension } from "../../shared/active-tools.ts";
 import { packageDir } from "../../shared/package-dir.ts";
-import { profileToolsExtension } from "../../shared/profile-tools.ts";
 
 const WEB_TOOLS = ["web_search", "fetch_content", "get_search_content"];
 
 const WORKER_PROMPT =
 	"You are a research worker. Another agent handed you the task below and will pass your report on. Do it with web search and page reading, preferring primary sources. Report in the task's language, self-contained, with a source link for each claim, and say what you could not verify.";
 
-export interface SolWorkerOptions {
+export interface WebResearchWorkerOptions {
 	/** Shared with the rest of the host, so the Codex login refreshes in one place. */
 	modelRuntime: ModelRuntime;
 	agentDir: string;
@@ -30,11 +30,11 @@ export interface SolWorkerOptions {
 }
 
 /** Runs one task in a fresh, unsaved session that can only search and read the web. */
-export class SolWorker {
-	readonly #options: SolWorkerOptions;
+export class WebResearchWorker {
+	readonly #options: WebResearchWorkerOptions;
 	readonly #webAccessPath: string;
 
-	constructor(options: SolWorkerOptions) {
+	constructor(options: WebResearchWorkerOptions) {
 		this.#options = options;
 		this.#webAccessPath = packageDir("pi-web-access");
 		mkdirSync(options.workDir, { recursive: true });
@@ -52,7 +52,7 @@ export class SolWorker {
 			noContextFiles: true,
 			additionalExtensionPaths: [this.#webAccessPath],
 			extensionFactories: [
-				{ name: "web-only", factory: profileToolsExtension(() => WEB_TOOLS) },
+				{ name: "web-only", factory: activeToolsExtension(() => WEB_TOOLS) },
 			],
 			appendSystemPrompt: [WORKER_PROMPT],
 		});

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

@@ -54,7 +54,7 @@ interface ServerTool {
 }
 
 /** Server-level tools only the owner's agent has; channel tools reuse the outside-agent set. */
-export const SERVER_TOOLS: Record<string, ServerTool> = {
+const SERVER_TOOLS: Record<string, ServerTool> = {
 	discord_list_servers: {
 		label: "List Discord servers",
 		describe: (o) =>
@@ -248,19 +248,19 @@ export const SERVER_TOOLS: Record<string, ServerTool> = {
 	},
 };
 
-/** Every Discord tool of the owner's `discord` profile. */
-export const DISCORD_OWNER_TOOLS = [
+/** Every Discord tool the owner's conversations may use: the names the `discord-admin` addon registers. */
+export const DISCORD_ADMIN_TOOLS: readonly string[] = Object.freeze([
 	...Object.keys(CHANNEL_TOOLS),
 	...Object.keys(SERVER_TOOLS),
-];
+]);
 
 /** Runs one Discord tool for the owner; throws ChannelToolError for a refused call. */
-export interface OwnerDiscord {
+export interface OwnerOperations {
 	run(tool: string, args: Record<string, unknown>): Promise<unknown>;
 }
 
 export function discordAdminExtension(
-	discord: OwnerDiscord,
+	discord: OwnerOperations,
 	owner: OwnerIdentity,
 ): ExtensionFactory {
 	const o = ownerWords(owner);

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

@@ -6,7 +6,12 @@ import { assistantName } from "../../i18n/index.ts";
 const MAX_SHOWN_COMMAND = 600;
 
 /** Pi's built-in shell and file tools, which agent sessions activate. */
-export const SHELL_TOOLS = ["bash", "read", "edit", "write"] as const;
+export const SHELL_TOOLS = Object.freeze([
+	"bash",
+	"read",
+	"edit",
+	"write",
+] as const);
 
 /** Programs that are held whatever their arguments. */
 const ALWAYS_HELD = new Set([
@@ -377,10 +382,10 @@ export function shellActionNeedingConfirmation(
 }
 
 /** Shell calls of a session with a workspace; sessions without one have no shell. */
-export const shellHoldRule: HoldRule = {
+export const shellHoldRule: Readonly<HoldRule> = Object.freeze<HoldRule>({
 	name: "shell",
 	describe: (tool, input, { workspace }) =>
 		workspace === undefined
 			? undefined
 			: shellActionNeedingConfirmation(tool, input, workspace),
-};
+});

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

@@ -1,22 +1,24 @@
 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";
 
-export const OWNER_MEMORY_KINDS = ["core", "note", "event"] as const;
-export type OwnerMemoryKind = (typeof OWNER_MEMORY_KINDS)[number];
+/** 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);
+export type MemoryKind = (typeof MEMORY_KINDS)[number];
 
-export interface OwnerMemory {
+export interface Memory {
 	id: number;
-	kind: OwnerMemoryKind;
+	kind: MemoryKind;
 	fact: string;
 	/** YYYY-MM-DD; set for events only. */
 	eventDate: string | null;
 }
 
-/** What every owner turn carries: all core facts, and events that have not passed yet. */
-export interface OwnerPromptMemory {
-	core: OwnerMemory[];
-	events: OwnerMemory[];
+/** What every turn carries: all core facts, and events that have not passed yet. */
+export interface PromptMemory {
+	core: Memory[];
+	events: Memory[];
 }
 
 const DATE = /^\d{4}-\d{2}-\d{2}$/;
@@ -24,12 +26,12 @@ const SEARCH_LIMIT = 20;
 
 interface Row {
 	id: string | number;
-	kind: OwnerMemoryKind;
+	kind: MemoryKind;
 	fact: string;
 	event_date: string | null;
 }
 
-function toMemory(row: Row): OwnerMemory {
+function toMemory(row: Row): Memory {
 	return {
 		id: Number(row.id),
 		kind: row.kind,
@@ -53,12 +55,12 @@ export function searchTerms(query: string): string[] {
 /** The trimmed fact, after the rules every stored memory follows. */
 function checkedFact(
 	fact: string,
-	kind: OwnerMemoryKind,
+	kind: MemoryKind,
 	eventDate: string | undefined,
 ): string {
 	const trimmed = fact.trim();
 	if (!trimmed) throw new MemoryError("a memory fact cannot be empty");
-	if (!(OWNER_MEMORY_KINDS as readonly string[]).includes(kind))
+	if (!(MEMORY_KINDS as readonly string[]).includes(kind))
 		throw new MemoryError(`unknown memory kind: ${kind}`);
 	if (kind === "event" && !(eventDate && DATE.test(eventDate)))
 		throw new MemoryError("an event needs its date as YYYY-MM-DD");
@@ -72,7 +74,7 @@ function checkedFact(
  * dated events. The store is bound to a speaker and never reads or changes another's; every
  * agent shares the memory of whoever is speaking.
  */
-export class OwnerMemoryStore {
+export class PgMemoryStore implements MemoryStore, SpeakerMemory {
 	readonly #sql: SQL;
 	/** Whose memory this is: a Discord user id. */
 	readonly speakerId: string;
@@ -108,7 +110,7 @@ export class OwnerMemoryStore {
 	 */
 	static migrations(ownerId: string): Migration[] {
 		return [
-			OwnerMemoryStore.migration,
+			PgMemoryStore.migration,
 			{
 				name: "owner-memory-speaker",
 				up: async (sql) => {
@@ -125,25 +127,25 @@ export class OwnerMemoryStore {
 	}
 
 	/** The store over the host's migrated pool, holding one speaker's memory. */
-	static attach(sql: SQL, speakerId: string): OwnerMemoryStore {
-		return new OwnerMemoryStore(sql, speakerId);
+	static attach(sql: SQL, speakerId: string): PgMemoryStore {
+		return new PgMemoryStore(sql, speakerId);
 	}
 
 	/** Another speaker's memory in the same database. */
-	forSpeaker(speakerId: string): OwnerMemoryStore {
+	forSpeaker(speakerId: string): PgMemoryStore {
 		return speakerId === this.speakerId
 			? this
-			: new OwnerMemoryStore(this.#sql, speakerId);
+			: new PgMemoryStore(this.#sql, speakerId);
 	}
 
-	async list(): Promise<OwnerMemory[]> {
+	async list(): Promise<Memory[]> {
 		const rows: Row[] = await this.#sql`
 			SELECT id, kind, fact, to_char(event_date, 'YYYY-MM-DD') AS event_date
 			FROM owner_memory WHERE speaker_id = ${this.speakerId} ORDER BY id`;
 		return rows.map(toMemory);
 	}
 
-	async forPrompt(today: string): Promise<OwnerPromptMemory> {
+	async forPrompt(today: string): Promise<PromptMemory> {
 		const rows: Row[] = await this.#sql`
 			SELECT id, kind, fact, to_char(event_date, 'YYYY-MM-DD') AS event_date
 			FROM owner_memory
@@ -159,9 +161,9 @@ export class OwnerMemoryStore {
 
 	async add(
 		fact: string,
-		kind: OwnerMemoryKind = "core",
+		kind: MemoryKind = "core",
 		eventDate?: string,
-	): Promise<OwnerMemory> {
+	): Promise<Memory> {
 		const trimmed = checkedFact(fact, kind, eventDate);
 		const [row]: Row[] = await this.#sql`
 			INSERT INTO owner_memory (speaker_id, fact, kind, event_date)
@@ -175,7 +177,7 @@ export class OwnerMemoryStore {
 	 * Memories containing any query term, case-insensitively, most terms matched first,
 	 * then newest first.
 	 */
-	async search(query: string, limit = SEARCH_LIMIT): Promise<OwnerMemory[]> {
+	async search(query: string, limit = SEARCH_LIMIT): Promise<Memory[]> {
 		const terms = searchTerms(query);
 		if (terms.length === 0) throw new MemoryError("the search query is empty");
 		const rows: (Row & { hits: number })[] = await this.#sql`
@@ -196,8 +198,8 @@ export class OwnerMemoryStore {
 	/** Replaces one memory's text, kind, and date under `add`'s rules; undefined when the id is unknown. */
 	async update(
 		id: number,
-		change: { fact: string; kind: OwnerMemoryKind; eventDate?: string },
-	): Promise<OwnerMemory | undefined> {
+		change: { fact: string; kind: MemoryKind; eventDate?: string },
+	): Promise<Memory | undefined> {
 		const trimmed = checkedFact(change.fact, change.kind, change.eventDate);
 		const [row]: Row[] = await this.#sql`
 			UPDATE owner_memory

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

@@ -2,23 +2,20 @@ import type { ExtensionFactory } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { messages } from "../../i18n/index.ts";
 import { type OwnerIdentity, ownerWords } from "../../identity.ts";
+import type { MemoryStore } from "../../services.ts";
 import { toolError, toolText } from "../../shared/tool-result.ts";
 import type { Speaker } from "../../speakers.ts";
 import { timeZone, zonedToday } from "../../time.ts";
-import type {
-	OwnerMemory,
-	OwnerMemoryStore,
-	OwnerPromptMemory,
-} from "./owner-memory-store.ts";
+import type { Memory, PromptMemory } from "./owner-memory-store.ts";
 
-function line(memory: OwnerMemory): string {
+function line(memory: Memory): string {
 	return memory.eventDate
 		? `- ${memory.eventDate}: ${memory.fact}`
 		: `- ${memory.fact}`;
 }
 
 export function ownerMemorySection(
-	memory: OwnerPromptMemory,
+	memory: PromptMemory,
 	today: string,
 	/** Whose memory it is, when not the owner's. */
 	speaker?: Speaker,
@@ -45,7 +42,9 @@ export function ownerMemorySection(
  * replaced system prompt.
  */
 export function ownerMemoryExtension(
-	ownerStore: OwnerMemoryStore,
+	memories: MemoryStore,
+	/** The owner's Discord id: the speaker whose memory a turn reads when no other speaks. */
+	ownerId: string,
 	owner: OwnerIdentity,
 	/**
 	 * The person the running turn is for, in a session that serves several. Their memory, not
@@ -57,12 +56,9 @@ export function ownerMemoryExtension(
 	/** The running turn's other speaker; undefined when the owner's own memory applies. */
 	const other = (): Speaker | undefined => {
 		const current = speaker?.();
-		return current && current.id !== ownerStore.speakerId ? current : undefined;
-	};
-	const storeOf = () => {
-		const current = other();
-		return current ? ownerStore.forSpeaker(current.id) : ownerStore;
+		return current && current.id !== ownerId ? current : undefined;
 	};
+	const storeOf = () => memories.forSpeaker(other()?.id ?? ownerId);
 	const shared = speaker
 		? " Whoever is speaking has a memory of their own, shared by every agent; this reads and changes theirs, not someone else's."
 		: "";