pi-discord-bot 0.1.3 → 0.1.31

package/dist/discord-interactions.js

@@ -1,4 +1,10 @@
 import * as log from "./log.js";
+function clearByPrefix(registry, prefix) {
+    for (const key of registry.keys()) {
+        if (key.startsWith(prefix))
+            registry.delete(key);
+    }
+}
 async function rejectForeignInteraction(interaction, message) {
     await interaction.reply({ content: message, ephemeral: true });
     return true;
@@ -9,6 +15,7 @@ export async function handleSelectMenuInteraction(interaction, state) {
         if (interaction.user.id !== modelRequest.userId)
             return rejectForeignInteraction(interaction, "This selector belongs to another user.");
         state.pendingModelSelections.delete(interaction.customId);
+        clearByPrefix(state.pendingModelPages, interaction.customId.replace(/:select$/, ":"));
         await interaction.update({ content: `Selected model: ${interaction.values[0]}`, embeds: [], components: [] });
         modelRequest.resolve(interaction.values[0] ?? null);
         return true;
@@ -18,6 +25,7 @@ export async function handleSelectMenuInteraction(interaction, state) {
         if (interaction.user.id !== scopedRequest.userId)
             return rejectForeignInteraction(interaction, "This selector belongs to another user.");
         state.pendingScopedSelections.delete(interaction.customId);
+        clearByPrefix(state.pendingScopedPages, interaction.customId.replace(/:select$/, ":"));
         await interaction.update({ content: interaction.values.length > 0 ? `Scoped models updated (${interaction.values.length} selected).` : "Scoped models cleared.", embeds: [], components: [] });
         scopedRequest.resolve(interaction.values);
         return true;
@@ -27,6 +35,7 @@ export async function handleSelectMenuInteraction(interaction, state) {
         if (interaction.user.id !== treeRequest.userId)
             return rejectForeignInteraction(interaction, "This tree browser belongs to another user.");
         state.pendingTreeSelections.delete(interaction.customId);
+        clearByPrefix(state.pendingTreePages, interaction.customId.replace(/:select$/, ":"));
         await interaction.update({ content: `Navigating to ${interaction.values[0]}...`, embeds: [], components: [] });
         log.info(`tree navigate selected by ${interaction.user.username}: ${interaction.values[0]}`);
         treeRequest.resolve(interaction.values[0] ?? null);

package/dist/discord.js

@@ -7,6 +7,10 @@ import { buildSlashCommands, isAllowedDiscordMessage, loadDiscordPolicy } from "
 import * as log from "./log.js";
 import { buildApprovalCard, buildModelSelectionCard, buildScopedModelSelectionCard, buildSessionCard, buildSettingsCard, buildTreeSelectionCard, } from "./discord-ui.js";
 import { clearPending, registerManyPending, registerPending, resolveOnTimeout } from "./discord-registry.js";
+function isImmediateCommandText(text) {
+    const command = text.trim().split(/\s+/)[0];
+    return new Set(["/help", "/session", "/tree", "/model", "/settings"]).has(command);
+}
 class ChannelQueue {
     queue = [];
     processing = false;
@@ -168,7 +172,12 @@ export class DiscordBot {
             text: cleanedText,
             attachments: attachments,
         };
-        this.queueFor(conversationKey).enqueue(() => this.handler.handleEvent(event, this));
+        if (isImmediateCommandText(cleanedText)) {
+            void this.handler.handleEvent(event, this);
+        }
+        else {
+            this.queueFor(conversationKey).enqueue(() => this.handler.handleEvent(event, this));
+        }
     }
     async onSelectMenu(interaction) {
         await handleSelectMenuInteraction(interaction, this.interactionState);
@@ -191,7 +200,12 @@ export class DiscordBot {
         this.pendingSlashInteractions.set(interaction.id, interaction);
         const event = buildSlashEvent(interaction, text);
         const key = this.getConversationKeyFromIds(event.guildId, event.channelId, event.threadId, event.userId);
-        this.queueFor(key).enqueue(() => this.handler.handleEvent(event, this));
+        if (isImmediateCommandText(text)) {
+            void this.handler.handleEvent(event, this);
+        }
+        else {
+            this.queueFor(key).enqueue(() => this.handler.handleEvent(event, this));
+        }
     }
     getConversationKey(message) {
         return this.getConversationKeyFromIds(message.guildId ?? undefined, message.channel.id, message.channel.isThread() ? message.channel.id : undefined, message.author.id);

package/dist/main.js

@@ -82,6 +82,15 @@ function isUiCommand(command) {
         "/exit",
     ]).has(command);
 }
+function isImmediateCommand(command) {
+    return new Set([
+        "/help",
+        "/session",
+        "/tree",
+        "/model",
+        "/settings",
+    ]).has(command);
+}
 async function handleCommand(event, transport) {
     const text = event.text.trim();
     if (!text.startsWith("/"))
@@ -93,7 +102,7 @@ async function handleCommand(event, transport) {
     if (event.source === "slash" && isUiCommand(command)) {
         await ctx.setWorking(false);
     }
-    if (state.running && command !== "/stop") {
+    if (state.running && command !== "/stop" && !isImmediateCommand(command)) {
         await ctx.replaceMessage("Already working. Use /stop first, then retry your command.");
         return true;
     }
@@ -127,7 +136,6 @@ async function handleCommand(event, transport) {
                 while (true) {
                     const selected = await transport.promptTreeSelection(event, { ...browser, page });
                     if (!selected || selected === "close") {
-                        await ctx.replaceMessage(state.runner.getTreeSummary());
                         return true;
                     }
                     if (selected === "prev") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-discord-bot",
-  "version": "0.1.3",
+  "version": "0.1.31",
   "description": "A small Discord harness built around Pi primitives.",
   "license": "MIT",
   "type": "module",