pi-roundtable 0.22.1 → 0.22.3

package/CHANGELOG.md

@@ -5,6 +5,18 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+## [0.22.3] - 2026-10-23
+
+### Changed
+
+- Question cards can be cancelled (`pi-roundtable`). Every Discord `ask_user` card, single or several questions, has a **Cancel** button beside Submit, for those who may answer it. Pressed while the turn still waits, `Prompts.ask` and `Prompts.questionnaire` resolve the new `"declined"`, and the `ask_user` result tells the model the owner cancelled the question without answering, not to ask it again, and to continue without the answer or end the turn if it cannot. Pressed after the grace period, it only closes the card and starts no turn. The card shows "❌ Cancelled, not answered." with its controls disabled. A surface that implements `Prompts` need not return `"declined"`; code that reads `ask` or `questionnaire` results should handle it. See [a prompt that outlives its turn](docs/plugins.md#a-prompt-that-outlives-its-turn-promptwait).
+
+## [0.22.2] - 2026-10-21
+
+### Fixed
+
+- A skill linked while another was removed no longer vanishes from the registry (`pi-roundtable`). `skill_unlink` reloaded the whole skill cache from the database after its delete, so a `skill_link` running at the same time, as two tool calls of one model message do, could commit its row after the reload had read the table and then be dropped from memory: the skill was missing from `skill_list`, unknown to `agent_skills` and `skill_group_set`, and could be neither unlinked nor linked again until a restart. The skill store now updates its memory from what each write committed and runs its writes one at a time, and a link that meets an existing row says "Already registered" instead of PostgreSQL's duplicate-key error. The agent store's seeding no longer reloads its cache either, and its agent and group writes also run one at a time, so an agent archived while its group is updated cannot come back as a member.
+
 ## [0.22.1] - 2026-10-21
 
 ### Changed

package/docs/plugins.md

@@ -2730,6 +2730,7 @@ A coding worker's cards give no `wait`, since nothing could resume a worker: it
 
 On Discord the grace period is `discord.cardGraceSeconds` (default 120), and the cards carry no countdown.
 A card answered late is edited to show the answer with its controls disabled, as one answered in time is; a second press finds it answered.
+Every question card, single or several questions, has a **Cancel** button beside its answer controls, for the same audience as the answers. Pressed while the turn still waits, `ask` and `questionnaire` resolve `"declined"`, and `ask_user` tells the model the person cancelled the question without answering, not to ask it again, and to go on without the answer or end its turn if it cannot. Pressed after the turn stopped waiting, it only closes the card: no turn starts and nothing stays pending. Either way the card shows "❌ Cancelled, not answered." with its controls disabled, and a second press finds it ended.
 Open cards live in memory: after a restart, pressing one replies, to the presser alone, that it is no longer valid and to ask again.
 
 #### Several questions on one card: `questionnaire` and `AskSupport`

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-roundtable",
-	"version": "0.22.1",
+	"version": "0.22.3",
 	"description": "A plugin-driven Pi agent server for one owner, reached through Discord or the web",
 	"type": "module",
 	"license": "MIT",

package/src/core/agents/agent-store.ts

@@ -58,6 +58,8 @@ export class PgAgentStore implements AgentDirectory {
 	readonly #sql: SQL;
 	readonly #agents = new Map<string, Agent>();
 	readonly #groups = new Map<string, AgentGroup>();
+	/** The tail of the agent and group writes, which run one at a time so none reads a map another is about to change. */
+	#queue: Promise<unknown> = Promise.resolve();
 
 	readonly #guild: string;
 	readonly #messages: GroupMessages;
@@ -97,18 +99,27 @@ export class PgAgentStore implements AgentDirectory {
 
 	/** Inserts seed agents that do not exist yet; existing rows, edited or not, are left alone. */
 	async seed(seeds: readonly AgentSeed[]): Promise<string[]> {
-		const added: string[] = [];
-		for (const seed of seeds) {
-			const rows: unknown[] = await this.#sql`
+		return this.#serial(async () => {
+			const added: string[] = [];
+			for (const seed of seeds) {
+				const rows: AgentRow[] = await this.#sql`
 				INSERT INTO agents (guild_id, name, display_name, prompt, avatar_prompt, channel_id)
 				VALUES (${this.#guild}, ${seed.name}, ${seed.displayName}, ${seed.prompt}, ${seed.avatarPrompt},
 					${seed.channelId ?? null})
 				ON CONFLICT DO NOTHING
-				RETURNING name`;
-			if (rows.length > 0) added.push(seed.name);
-		}
-		await this.#reload();
-		return added;
+				RETURNING *`;
+				// Only the inserted rows join the map: reloading it whole would drop a write that
+				// committed after its SELECT.
+				if (rows[0]) added.push(this.#keepAgent(rows[0]).name);
+			}
+			return added;
+		});
+	}
+
+	#serial<T>(write: () => Promise<T>): Promise<T> {
+		const run = this.#queue.then(write);
+		this.#queue = run.catch(() => undefined);
+		return run;
 	}
 
 	agents(): Agent[] {
@@ -178,18 +189,20 @@ export class PgAgentStore implements AgentDirectory {
 		avatarPrompt: string;
 		channelId: string;
 	}): Promise<Agent> {
-		checkAgentName(agent.name);
-		checkDisplayName(agent.displayName);
-		checkPrompt(agent.prompt);
-		// An agent of a host without an image provider has no avatar prompt.
-		if (agent.avatarPrompt !== "") checkAvatarPrompt(agent.avatarPrompt);
-		this.#checkFree(agent.name);
-		const rows: AgentRow[] = await this.#sql`
+		return this.#serial(async () => {
+			checkAgentName(agent.name);
+			checkDisplayName(agent.displayName);
+			checkPrompt(agent.prompt);
+			// An agent of a host without an image provider has no avatar prompt.
+			if (agent.avatarPrompt !== "") checkAvatarPrompt(agent.avatarPrompt);
+			this.#checkFree(agent.name);
+			const rows: AgentRow[] = await this.#sql`
 			INSERT INTO agents (guild_id, name, display_name, prompt, avatar_prompt, channel_id)
 			VALUES (${this.#guild}, ${agent.name}, ${agent.displayName.trim()}, ${agent.prompt}, ${agent.avatarPrompt},
 				${agent.channelId})
 			RETURNING *`;
-		return this.#keepAgent(rows[0]);
+			return this.#keepAgent(rows[0]);
+		});
 	}
 
 	/** A name that createAgent would accept, checked before its channel is made. */
@@ -211,20 +224,22 @@ export class PgAgentStore implements AgentDirectory {
 			thinking?: ThinkingLevel | null;
 		},
 	): Promise<Agent> {
-		const current = this.activeAgent(name);
-		if (change.displayName !== undefined) checkDisplayName(change.displayName);
-		if (change.prompt !== undefined) checkPrompt(change.prompt);
-		if (change.avatarPrompt !== undefined)
-			checkAvatarPrompt(change.avatarPrompt);
-		if (change.model) checkModelRef(change.model);
-		if (change.thinking) checkThinking(change.thinking);
-		const model =
-			change.model === undefined ? (current.model ?? null) : change.model;
-		const thinking =
-			change.thinking === undefined
-				? (current.thinking ?? null)
-				: change.thinking;
-		const rows: AgentRow[] = await this.#sql`
+		return this.#serial(async () => {
+			const current = this.activeAgent(name);
+			if (change.displayName !== undefined)
+				checkDisplayName(change.displayName);
+			if (change.prompt !== undefined) checkPrompt(change.prompt);
+			if (change.avatarPrompt !== undefined)
+				checkAvatarPrompt(change.avatarPrompt);
+			if (change.model) checkModelRef(change.model);
+			if (change.thinking) checkThinking(change.thinking);
+			const model =
+				change.model === undefined ? (current.model ?? null) : change.model;
+			const thinking =
+				change.thinking === undefined
+					? (current.thinking ?? null)
+					: change.thinking;
+			const rows: AgentRow[] = await this.#sql`
 			UPDATE agents SET
 				display_name = ${change.displayName?.trim() ?? current.displayName},
 				prompt = ${change.prompt ?? current.prompt},
@@ -236,29 +251,33 @@ export class PgAgentStore implements AgentDirectory {
 				updated_at = now()
 			WHERE guild_id = ${this.#guild} AND name = ${name}
 			RETURNING *`;
-		return this.#keepAgent(rows[0]);
+			return this.#keepAgent(rows[0]);
+		});
 	}
 
 	/** Archives an agent and takes it out of every group; says which groups it left. */
 	async archiveAgent(name: string): Promise<AgentGroup[]> {
-		const rows: AgentRow[] = await this.#sql`
+		return this.#serial(async () => {
+			const rows: AgentRow[] = await this.#sql`
 			UPDATE agents SET status = 'archived', updated_at = now()
 			WHERE guild_id = ${this.#guild} AND name = ${name} RETURNING *`;
-		this.#keepAgent(rows[0]);
-		const left: AgentGroup[] = [];
-		for (const group of this.groups()) {
-			if (group.status !== "active" || !group.members.includes(name)) continue;
-			const members = group.members.filter((m) => m !== name);
-			const host = group.host === name ? (members[0] ?? name) : group.host;
-			left.push(
-				await this.#writeGroup(group.name, {
-					members,
-					host,
-					status: members.length < MIN_GROUP_MEMBERS ? "archived" : "active",
-				}),
-			);
-		}
-		return left;
+			this.#keepAgent(rows[0]);
+			const left: AgentGroup[] = [];
+			for (const group of this.groups()) {
+				if (group.status !== "active" || !group.members.includes(name))
+					continue;
+				const members = group.members.filter((m) => m !== name);
+				const host = group.host === name ? (members[0] ?? name) : group.host;
+				left.push(
+					await this.#writeGroup(group.name, {
+						members,
+						host,
+						status: members.length < MIN_GROUP_MEMBERS ? "archived" : "active",
+					}),
+				);
+			}
+			return left;
+		});
 	}
 
 	#keepAgent(row: AgentRow | undefined): Agent {
@@ -296,39 +315,44 @@ export class PgAgentStore implements AgentDirectory {
 		members: string[];
 		host: string;
 	}): Promise<AgentGroup> {
-		this.checkNewGroup(group.name, group.members, group.host);
-		checkDisplayName(group.displayName);
-		const rows: GroupRow[] = await this.#sql`
+		return this.#serial(async () => {
+			this.checkNewGroup(group.name, group.members, group.host);
+			checkDisplayName(group.displayName);
+			const rows: GroupRow[] = await this.#sql`
 			INSERT INTO agent_groups (guild_id, name, display_name, channel_id, members, host)
 			VALUES (${this.#guild}, ${group.name}, ${group.displayName.trim()}, ${group.channelId},
 				${group.members.join(",")}, ${group.host})
 			RETURNING *`;
-		return this.#keepGroup(rows[0]);
+			return this.#keepGroup(rows[0]);
+		});
 	}
 
 	async updateGroup(
 		name: string,
 		change: { displayName?: string; members?: string[]; host?: string },
 	): Promise<AgentGroup> {
-		const current = this.#groups.get(name);
-		if (current?.status !== "active")
-			throw new AgentError(`There is no active group "${name}".`);
-		if (change.displayName !== undefined) checkDisplayName(change.displayName);
-		const members = change.members ?? current.members;
-		const host =
-			change.host ??
-			(members.includes(current.host) ? current.host : (members[0] ?? ""));
-		this.#checkMembers(members, host);
-		return this.#writeGroup(name, {
-			displayName: change.displayName?.trim() ?? current.displayName,
-			members,
-			host,
-			status: "active",
+		return this.#serial(async () => {
+			const current = this.#groups.get(name);
+			if (current?.status !== "active")
+				throw new AgentError(`There is no active group "${name}".`);
+			if (change.displayName !== undefined)
+				checkDisplayName(change.displayName);
+			const members = change.members ?? current.members;
+			const host =
+				change.host ??
+				(members.includes(current.host) ? current.host : (members[0] ?? ""));
+			this.#checkMembers(members, host);
+			return this.#writeGroup(name, {
+				displayName: change.displayName?.trim() ?? current.displayName,
+				members,
+				host,
+				status: "active",
+			});
 		});
 	}
 
 	async archiveGroup(name: string): Promise<AgentGroup> {
-		return this.#writeGroup(name, { status: "archived" });
+		return this.#serial(() => this.#writeGroup(name, { status: "archived" }));
 	}
 
 	async #writeGroup(

package/src/core/discord/owner-card-asks.ts

@@ -11,7 +11,7 @@ import type {
 import type { CardAudiences } from "./card-audience.ts";
 import type { QuestionnaireForm } from "./owner-card-questionnaire.ts";
 import { newDraft, questionnaireCard } from "./owner-card-questionnaire.ts";
-import { askRows, previewsRow } from "./owner-card-rows.ts";
+import { askRows, cancelRow, previewsRow } from "./owner-card-rows.ts";
 import type { PostCard } from "./owner-card-types.ts";
 
 /** What the Discord card shows of a questionnaire: four questions, previews, and a note. */
@@ -34,7 +34,7 @@ export function askPrompts(args: {
 		ask: async (title, question, signal, wait) => {
 			const audience = await audiences.question(scope);
 			if (!audience) return undefined;
-			return post<OwnerAnswer | "pending" | undefined>(
+			return post<OwnerAnswer | "pending" | "declined" | undefined>(
 				channelId,
 				signal,
 				undefined,
@@ -57,7 +57,11 @@ export function askPrompts(args: {
 					title,
 					sections: [question.question],
 					question,
-					rows: (id, disabled) => askRows(id, question, disabled),
+					declined: "declined",
+					rows: (id, disabled) => [
+						...askRows(id, question, disabled),
+						cancelRow(id, disabled),
+					],
 					footer: messages().cardQuestionFooter,
 				},
 			);
@@ -68,40 +72,39 @@ export function askPrompts(args: {
 			const [only] = questionnaire.questions;
 			if (only && questionnaire.questions.length === 1) {
 				// One question is the 0.19 card, answered by one click, with a Previews button.
-				const answer = await post<OwnerAnswer | "pending" | undefined>(
-					channelId,
-					signal,
-					undefined,
-					undefined,
-					{
-						audience,
-						...(wait
-							? {
-									wait: {
-										pending: "pending",
-										late: (value, by) =>
-											wait.late({
-												kind: "questionnaire",
-												answer: { answers: [value as OwnerAnswer] },
-												by: by.user.name,
-											}),
-									},
-								}
-							: {}),
-						title,
-						sections: [only.question],
-						question: only,
-						previews: questionnaire,
-						rows: (id, disabled) => [
-							...askRows(id, only, disabled),
-							...(only.options.some((o) => o.preview !== undefined)
-								? [previewsRow(id, disabled)]
-								: []),
-						],
-						footer: messages().cardQuestionFooter,
-					},
-				);
-				return answer === "pending" || answer === undefined
+				const answer = await post<
+					OwnerAnswer | "pending" | "declined" | undefined
+				>(channelId, signal, undefined, undefined, {
+					audience,
+					...(wait
+						? {
+								wait: {
+									pending: "pending",
+									late: (value, by) =>
+										wait.late({
+											kind: "questionnaire",
+											answer: { answers: [value as OwnerAnswer] },
+											by: by.user.name,
+										}),
+								},
+							}
+						: {}),
+					title,
+					sections: [only.question],
+					question: only,
+					previews: questionnaire,
+					declined: "declined",
+					rows: (id, disabled) => [
+						...askRows(id, only, disabled),
+						only.options.some((o) => o.preview !== undefined)
+							? previewsRow(id, disabled)
+							: cancelRow(id, disabled),
+					],
+					footer: messages().cardQuestionFooter,
+				});
+				return answer === "pending" ||
+					answer === "declined" ||
+					answer === undefined
 					? answer
 					: { answers: [answer] };
 			}
@@ -109,7 +112,7 @@ export function askPrompts(args: {
 				questionnaire,
 				draft: newDraft(questionnaire.questions.length),
 			};
-			return post<QuestionnaireAnswer | "pending" | undefined>(
+			return post<QuestionnaireAnswer | "pending" | "declined" | undefined>(
 				channelId,
 				signal,
 				undefined,
@@ -132,6 +135,7 @@ export function askPrompts(args: {
 					title,
 					sections: [],
 					form,
+					declined: "declined",
 					build: (id, footer, disabled) =>
 						questionnaireCard({
 							id,

package/src/core/discord/owner-card-questionnaire.ts

@@ -19,7 +19,7 @@ import {
 	type Questionnaire,
 	type QuestionnaireAnswer,
 } from "../interactions/questionnaire.ts";
-import { CARD_PREFIX } from "./owner-card-rows.ts";
+import { CARD_PREFIX, cancelButton } from "./owner-card-rows.ts";
 import type { CardPayload } from "./owner-card-types.ts";
 import { ephemeralPanel, ownerPanels, plain } from "./owner-panel.ts";
 import { clip } from "./utf16.ts";
@@ -127,6 +127,7 @@ function buttons(id: string, form: QuestionnaireForm, disabled: boolean) {
 			.setDisabled(disabled);
 	row.addComponents(
 		button("submit", messages().cardSubmitLabel, ButtonStyle.Primary),
+		cancelButton(id, disabled),
 		button("notes", messages().cardWriteLabel, ButtonStyle.Secondary),
 	);
 	if (questions.some((q) => q.options.some((o) => o.preview !== undefined)))

package/src/core/discord/owner-card-rows.ts

@@ -85,7 +85,7 @@ export function askRows(
 	];
 }
 
-/** The Previews button of a single-question card: it shows the options' previews and answers nothing. */
+/** The Previews button of a single-question card, which answers nothing, beside its Cancel button. */
 export function previewsRow(id: string, disabled: boolean) {
 	return new ActionRowBuilder<ButtonBuilder>().addComponents(
 		new ButtonBuilder()
@@ -93,6 +93,24 @@ export function previewsRow(id: string, disabled: boolean) {
 			.setLabel(messages().cardPreviewsLabel)
 			.setStyle(ButtonStyle.Secondary)
 			.setDisabled(disabled),
+		cancelButton(id, disabled),
+	);
+}
+
+/** A question card's Cancel button: the question is declined, not answered. */
+export function cancelButton(id: string, disabled: boolean): ButtonBuilder {
+	return new ButtonBuilder()
+		.setCustomId(`${CARD_PREFIX}${id}:cancel`)
+		.setLabel(messages().cardCancelLabel)
+		.setEmoji("❌")
+		.setStyle(ButtonStyle.Secondary)
+		.setDisabled(disabled);
+}
+
+/** A single-question card's row with only its Cancel button. */
+export function cancelRow(id: string, disabled: boolean) {
+	return new ActionRowBuilder<ButtonBuilder>().addComponents(
+		cancelButton(id, disabled),
 	);
 }
 

package/src/core/discord/owner-card-types.ts

@@ -72,6 +72,12 @@ export interface OpenCard {
 	 * already, answered by another press or withdrawn by its plugin, and this answer changed nothing.
 	 */
 	end(value: unknown, by: Answerer): boolean;
+	/**
+	 * Ends a question card declined, its Cancel button: a turn still waiting gets `declined`, and
+	 * a card whose turn stopped waiting only closes, starting no turn. False when the card had
+	 * ended already or is not a question.
+	 */
+	decline(): boolean;
 	question?: OwnerQuestion;
 	/** A questionnaire card's questions and its shared draft. */
 	form?: QuestionnaireForm;
@@ -99,6 +105,8 @@ export interface CardSpec<T> {
 	question?: OwnerQuestion;
 	form?: QuestionnaireForm;
 	previews?: Questionnaire;
+	/** What a question card resolves with when it is cancelled; without it the card has no Cancel. */
+	declined?: T;
 	/** Draws the card itself, as a questionnaire does; without it the card is the title, sections and rows. */
 	build?(id: string, footer: string, disabled: boolean): CardPayload;
 	rows?(id: string, disabled: boolean): Rows;

package/src/core/discord/owner-cards.ts

@@ -295,6 +295,12 @@ export class OwnerCards implements InteractionModule {
 					}
 					return true;
 				},
+				decline: () => {
+					if (!this.#open.has(id) || !("declined" in card)) return false;
+					// After the grace period settling only closes the card: no turn starts.
+					settle(card.declined as T, undefined);
+					return true;
+				},
 				...(card.question ? { question: card.question } : {}),
 				...(card.form ? { form: card.form } : {}),
 				...(card.previews ? { previews: card.previews } : {}),
@@ -428,6 +434,18 @@ export class OwnerCards implements InteractionModule {
 			);
 			return true;
 		}
+		if (interaction.isButton() && action === "cancel") {
+			// Another press, a stop or a withdrawal ended it while this one was being checked.
+			if (!card.decline()) {
+				await interaction.reply({
+					content: messages().cardInactive,
+					flags: MessageFlags.Ephemeral,
+				});
+				return true;
+			}
+			await interaction.update(card.view(messages().cardQuestionCancelled));
+			return true;
+		}
 		if (card.form) await answerForm(card, id, action, interaction);
 		else await answerSingle(card, id, action, interaction, by);
 		return true;

package/src/core/i18n/cards.ts

@@ -34,6 +34,7 @@ export function cardsEn(ctx: CatalogContext) {
 		cardInactive: `This card is no longer valid (${ctx.assistant} restarted since it was posted, or it was already answered or withdrawn); ask again, or reply in text.`,
 		cardApproved: "✅ Approved to run.",
 		cardDeclined: "❌ Cancelled.",
+		cardQuestionCancelled: "❌ Cancelled, not answered.",
 		cardAnswerLabel: "Answer…",
 		cardOtherLabel: "Other…",
 		cardOtherDescription: "Write your own answer",
@@ -81,6 +82,7 @@ export function cardsZhTW(ctx: CatalogContext): ReturnType<typeof cardsEn> {
 		cardInactive: `這張卡片已經失效（${ctx.assistant} 在它發出後重新啟動過，或它已經回答過或被撤回）；請再問一次，或直接打字回覆。`,
 		cardApproved: "✅ 已核准執行。",
 		cardDeclined: "❌ 已取消。",
+		cardQuestionCancelled: "❌ 已取消，沒有回答。",
 		cardAnswerLabel: "回答…",
 		cardOtherLabel: "其他…",
 		cardOtherDescription: "自己寫答案",

package/src/core/interactions/prompts.ts

@@ -248,15 +248,17 @@ export interface Prompts {
 		options?: ApprovalOptions,
 	): Promise<Approval>;
 	/**
-	 * Asks a question; undefined when no one answered it or it was cancelled, and `pending`, only
-	 * with a `wait`, when the turn stopped waiting and the question stays open.
+	 * Asks a question; undefined when no one answered it or it was cancelled, `declined` when the
+	 * one asked cancelled the question on its card instead of answering, and `pending`, only with
+	 * a `wait`, when the turn stopped waiting and the question stays open. A question cancelled
+	 * after the turn stopped waiting only closes: it starts no turn.
 	 */
 	ask(
 		title: string,
 		question: OwnerQuestion,
 		signal?: AbortSignal,
 		wait?: PromptWait,
-	): Promise<OwnerAnswer | "pending" | undefined>;
+	): Promise<OwnerAnswer | "pending" | "declined" | undefined>;
 	/**
 	 * What `questionnaire` can show; absent means the 0.19 contract (one question, no previews,
 	 * no note), and `ask` is the only way to ask.
@@ -272,7 +274,7 @@ export interface Prompts {
 		questionnaire: Questionnaire,
 		signal?: AbortSignal,
 		wait?: PromptWait,
-	): Promise<QuestionnaireAnswer | "pending" | undefined>;
+	): Promise<QuestionnaireAnswer | "pending" | "declined" | undefined>;
 }
 
 /** @deprecated Since 0.9 the prompts are `Prompts`, answered by those their `PromptScope` names; this name goes away in 1.0. */

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

@@ -70,6 +70,11 @@ export class SkillStore {
 	readonly #skills = new Map<string, SkillEntry>();
 	readonly #groups = new Map<string, SkillGroup>();
 	readonly #carried = new Map<string, string[]>();
+	/**
+	 * The tail of the mutations, which run one at a time: each checks the maps, writes, then
+	 * updates the maps from what it committed, and none may interleave with another.
+	 */
+	#queue: Promise<unknown> = Promise.resolve();
 
 	readonly #guild: string;
 
@@ -152,6 +157,12 @@ export class SkillStore {
 			]);
 	}
 
+	#serial<T>(write: () => Promise<T>): Promise<T> {
+		const run = this.#queue.then(write);
+		this.#queue = run.catch(() => undefined);
+		return run;
+	}
+
 	skills(): SkillEntry[] {
 		return [...this.#skills.values()].sort((a, b) =>
 			a.name.localeCompare(b.name),
@@ -189,19 +200,29 @@ export class SkillStore {
 	async addLinked(
 		entries: readonly { name: string; repo: string; path: string }[],
 	): Promise<void> {
-		const taken = entries.filter((entry) => this.#skills.has(entry.name));
-		if (taken.length > 0)
-			throw new AgentError(
-				`Already registered: ${taken.map((entry) => entry.name).join(", ")}. Nothing was linked.`,
-			);
-		await this.#sql.begin(async (tx) => {
+		return this.#serial(async () => {
+			const taken = entries.filter((entry) => this.#skills.has(entry.name));
+			const refuse = (names: string[]) =>
+				new AgentError(
+					`Already registered: ${names.join(", ")}. Nothing was linked.`,
+				);
+			if (taken.length > 0) throw refuse(taken.map((entry) => entry.name));
+			try {
+				await this.#sql.begin(async (tx) => {
+					for (const entry of entries)
+						await tx`
+							INSERT INTO skills (name, kind, repo, path)
+							VALUES (${entry.name}, 'linked', ${entry.repo}, ${entry.path})`;
+				});
+			} catch (error) {
+				// A row the maps do not hold, such as a duplicate within `entries`.
+				if (isUniqueViolation(error))
+					throw refuse(entries.map((entry) => entry.name));
+				throw error;
+			}
 			for (const entry of entries)
-				await tx`
-					INSERT INTO skills (name, kind, repo, path)
-					VALUES (${entry.name}, 'linked', ${entry.repo}, ${entry.path})`;
+				this.#skills.set(entry.name, { kind: "linked", ...entry });
 		});
-		for (const entry of entries)
-			this.#skills.set(entry.name, { kind: "linked", ...entry });
 	}
 
 	async addWritten(skill: {
@@ -209,12 +230,14 @@ export class SkillStore {
 		description: string;
 		body: string;
 	}): Promise<void> {
-		if (this.#skills.has(skill.name))
-			throw new AgentError(`A skill named "${skill.name}" already exists.`);
-		await this.#sql`
-			INSERT INTO skills (name, kind, description, body)
-			VALUES (${skill.name}, 'written', ${skill.description}, ${skill.body})`;
-		this.#skills.set(skill.name, { kind: "written", ...skill });
+		return this.#serial(async () => {
+			if (this.#skills.has(skill.name))
+				throw new AgentError(`A skill named "${skill.name}" already exists.`);
+			await this.#sql`
+				INSERT INTO skills (name, kind, description, body)
+				VALUES (${skill.name}, 'written', ${skill.description}, ${skill.body})`;
+			this.#skills.set(skill.name, { kind: "written", ...skill });
+		});
 	}
 
 	async updateWritten(skill: {
@@ -222,54 +245,84 @@ export class SkillStore {
 		description: string;
 		body: string;
 	}): Promise<void> {
-		await this.#sql`
-			UPDATE skills SET description = ${skill.description}, body = ${skill.body},
-				updated_at = now()
-			WHERE name = ${skill.name} AND kind = 'written'`;
-		this.#skills.set(skill.name, { kind: "written", ...skill });
+		return this.#serial(async () => {
+			await this.#sql`
+				UPDATE skills SET description = ${skill.description}, body = ${skill.body},
+					updated_at = now()
+				WHERE name = ${skill.name} AND kind = 'written'`;
+			this.#skills.set(skill.name, { kind: "written", ...skill });
+		});
 	}
 
 	/** Removes a skill and detaches it from every agent and group. */
 	async remove(name: string): Promise<Detached> {
-		const agents = this.carriers(name);
-		const groups = this.groups().filter((group) => group.skills.includes(name));
-		await this.#sql.begin(async (tx) => {
-			await tx`DELETE FROM skills WHERE name = ${name}`;
-			await tx`DELETE FROM agent_skills WHERE guild_id = ${this.#guild} AND skill = ${name}`;
+		return this.#serial(async () => {
+			const agents = this.carriers(name);
+			const groups = this.groups().filter((group) =>
+				group.skills.includes(name),
+			);
+			await this.#sql.begin(async (tx) => {
+				await tx`DELETE FROM skills WHERE name = ${name}`;
+				await tx`DELETE FROM agent_skills WHERE guild_id = ${this.#guild} AND skill = ${name}`;
+				for (const group of groups)
+					await tx`
+						UPDATE skill_groups
+						SET skills = ${group.skills.filter((s) => s !== name).join(",")}
+						WHERE name = ${group.name}`;
+			});
+			// The maps follow the transaction; reloading them all here would drop a write that
+			// committed after its SELECT.
+			this.#skills.delete(name);
+			for (const agent of agents) {
+				const left = this.carriedBy(agent).filter((s) => s !== name);
+				if (left.length > 0) this.#carried.set(agent, left);
+				else this.#carried.delete(agent);
+			}
 			for (const group of groups)
-				await tx`
-					UPDATE skill_groups
-					SET skills = ${group.skills.filter((s) => s !== name).join(",")}
-					WHERE name = ${group.name}`;
+				this.#groups.set(group.name, {
+					...group,
+					skills: group.skills.filter((s) => s !== name),
+				});
+			return { agents, groups: groups.map((group) => group.name) };
 		});
-		await this.#reload();
-		return { agents, groups: groups.map((group) => group.name) };
 	}
 
 	async setGroup(group: SkillGroup): Promise<void> {
-		await this.#sql`
-			INSERT INTO skill_groups (name, description, skills)
-			VALUES (${group.name}, ${group.description}, ${group.skills.join(",")})
-			ON CONFLICT (name) DO UPDATE
-			SET description = EXCLUDED.description, skills = EXCLUDED.skills`;
-		this.#groups.set(group.name, { ...group, skills: [...group.skills] });
+		return this.#serial(async () => {
+			await this.#sql`
+				INSERT INTO skill_groups (name, description, skills)
+				VALUES (${group.name}, ${group.description}, ${group.skills.join(",")})
+				ON CONFLICT (name) DO UPDATE
+				SET description = EXCLUDED.description, skills = EXCLUDED.skills`;
+			this.#groups.set(group.name, { ...group, skills: [...group.skills] });
+		});
 	}
 
 	async removeGroup(name: string): Promise<void> {
-		await this.#sql`DELETE FROM skill_groups WHERE name = ${name}`;
-		this.#groups.delete(name);
+		return this.#serial(async () => {
+			await this.#sql`DELETE FROM skill_groups WHERE name = ${name}`;
+			this.#groups.delete(name);
+		});
 	}
 
 	/** Replaces the registered skills an agent carries. */
 	async setCarried(agent: string, skills: readonly string[]): Promise<void> {
 		// pi-lens-ignore: no-sort-without-comparator — skill names sort by code unit, the same order on every machine
 		const sorted = [...new Set(skills)].sort();
-		await this.#sql.begin(async (tx) => {
-			await tx`DELETE FROM agent_skills WHERE guild_id = ${this.#guild} AND agent = ${agent}`;
-			for (const skill of sorted)
-				await tx`INSERT INTO agent_skills (guild_id, agent, skill) VALUES (${this.#guild}, ${agent}, ${skill})`;
+		return this.#serial(async () => {
+			await this.#sql.begin(async (tx) => {
+				await tx`DELETE FROM agent_skills WHERE guild_id = ${this.#guild} AND agent = ${agent}`;
+				for (const skill of sorted)
+					await tx`INSERT INTO agent_skills (guild_id, agent, skill) VALUES (${this.#guild}, ${agent}, ${skill})`;
+			});
+			if (sorted.length > 0) this.#carried.set(agent, sorted);
+			else this.#carried.delete(agent);
 		});
-		if (sorted.length > 0) this.#carried.set(agent, sorted);
-		else this.#carried.delete(agent);
 	}
 }
+
+/** PostgreSQL's unique_violation, as Bun's driver reports it. */
+function isUniqueViolation(error: unknown): boolean {
+	const fields = error as { errno?: unknown; code?: unknown } | null;
+	return fields?.errno === "23505" || fields?.code === "23505";
+}

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

@@ -61,7 +61,7 @@ export async function askQuestions(
 		);
 		if (n === 1)
 			return answerText(
-				answer === "pending" || answer === undefined
+				answer === "pending" || answer === "declined" || answer === undefined
 					? answer
 					: (answer.answers[0] ?? { choices: [] }),
 				owner,
@@ -79,11 +79,11 @@ export async function askQuestions(
 					: undefined,
 		});
 		if (n === 1) return answerText(answer, owner);
-		if (answer === "pending" || answer === undefined)
+		if (answer === "pending" || answer === "declined" || answer === undefined)
 			return sequentialText(
 				questionnaire,
 				answers,
-				answer === "pending" ? "pending" : "unanswered",
+				answer ?? "unanswered",
 				owner,
 				answerText(answer, owner),
 			);

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

@@ -11,10 +11,12 @@ const NAME_CHARS = 120;
 
 /** The tool's result: what the owner chose and wrote. */
 export function answerText(
-	answer: OwnerAnswer | "pending" | undefined,
+	answer: OwnerAnswer | "pending" | "declined" | undefined,
 	owner: OwnerIdentity,
 ): string {
 	const o = ownerWords(owner);
+	if (answer === "declined")
+		return `${o.name} cancelled the question on its card without answering. Do not ask the same question again. Continue without the answer, or, if you cannot go on without it, end your turn saying so.`;
 	if (answer === "pending")
 		return `${o.name} has not answered yet. The card stays open, so do not ask again and do not wait for it. End your turn now: say briefly that you are waiting for ${o.his} answer on the card. When ${o.he} answers, a new turn brings you the answer and you continue from there.`;
 	if (!answer)
@@ -72,11 +74,12 @@ function listOf(
 
 /** The tool's result for a questionnaire: each question's answer, and the note. */
 export function questionnaireText(
-	answer: QuestionnaireAnswer | "pending" | undefined,
+	answer: QuestionnaireAnswer | "pending" | "declined" | undefined,
 	questionnaire: Questionnaire,
 	owner: OwnerIdentity,
 ): string {
-	if (answer === "pending" || !answer) return answerText(answer, owner);
+	if (answer === "pending" || answer === "declined" || !answer)
+		return answerText(answer, owner);
 	return [
 		`${owner.name} answered your questions on the card:`,
 		...listOf(questionnaire, answer),
@@ -102,7 +105,7 @@ export function lateQuestionnaireText(
 export function sequentialText(
 	asked: Questionnaire,
 	answers: readonly OwnerAnswer[],
-	stopped: "pending" | "unanswered" | undefined,
+	stopped: "pending" | "declined" | "unanswered" | undefined,
 	owner: OwnerIdentity,
 	stoppedText: string,
 ): string {

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

@@ -93,7 +93,7 @@ export const QUESTIONNAIRE_CHECKS: readonly QuestionnaireCheck[] = [
 			const given = answerOf(set, found.asks);
 			await answer(id, given, set);
 			const got = await result;
-			if (got === "pending" || got === undefined)
+			if (got === "pending" || got === "declined" || got === undefined)
 				throw new ContractBroken(`the person's answers came back ${got}`);
 			expectThat(
 				JSON.stringify(got.answers.map((a) => a ?? null)) ===