@friendlyrobot/discord-pi-agent 0.17.0 → 0.18.0

package/README.md

@@ -16,6 +16,7 @@ Reusable Discord gateway for persistent pi agent sessions — DM and forum chann
 - `!help`
 - `!status`
 - `!thinking`
+- `!model`
 - `!compact`
 - `!reload`
 - `!reset-session`

package/dist/discord-auth.d.ts

@@ -1,9 +1,9 @@
 import { type Message } from "discord.js";
-import type { GatewayAuthConfig } from "./discord-gateway-client";
+import type { GatewayAccessConfig } from "./types";
 export declare function getAuthorDisplayName(message: Message): string;
 /**
  * Determine the session scope from an incoming message.
  * Returns null for unsupported channel types (silently ignored).
  */
 export declare function resolveMessageScope(message: Message): string | null;
-export declare function isAuthorizedMessage(message: Message, scope: string, authConfig: GatewayAuthConfig): boolean;
+export declare function isAuthorizedMessage(message: Message, scope: string, accessConfig: GatewayAccessConfig): boolean;

package/dist/discord-gateway-client.d.ts

@@ -1,11 +1,5 @@
 import { Client } from "discord.js";
 import type { AgentService } from "./agent-service";
 import type { SessionRegistry } from "./session-registry";
-import type { ResolvedDiscordGatewayConfig } from "./types";
-export type GatewayAuthConfig = {
-    discordAllowedUserId: string;
-    discordAllowedForumChannelIds: string[];
-    discordAllowedUserIds: string[];
-    startupMessage: string | false;
-};
-export declare function startGatewayClient(config: ResolvedDiscordGatewayConfig, agentService: AgentService, sessionRegistry: SessionRegistry, authConfig: GatewayAuthConfig): Promise<Client>;
+import type { GatewayAccessConfig, ResolvedDiscordGatewayConfig } from "./types";
+export declare function startGatewayClient(config: ResolvedDiscordGatewayConfig, agentService: AgentService, sessionRegistry: SessionRegistry, accessConfig: GatewayAccessConfig): Promise<Client>;

package/dist/discord-message-handler.d.ts

@@ -1,6 +1,5 @@
 import type { Message } from "discord.js";
 import type { AgentService } from "./agent-service";
 import type { SessionRegistry } from "./session-registry";
-import type { ResolvedDiscordGatewayConfig } from "./types";
-import type { GatewayAuthConfig } from "./discord-gateway-client";
-export declare function handleDiscordMessage(message: Message, config: ResolvedDiscordGatewayConfig, agentService: AgentService, sessionRegistry: SessionRegistry, authConfig: GatewayAuthConfig): Promise<void>;
+import type { GatewayAccessConfig, ResolvedDiscordGatewayConfig } from "./types";
+export declare function handleDiscordMessage(message: Message, config: ResolvedDiscordGatewayConfig, agentService: AgentService, sessionRegistry: SessionRegistry, accessConfig: GatewayAccessConfig): Promise<void>;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import type { DiscordGateway, DiscordGatewayConfig } from "./types";
 export { buildDiscordMessageContextPrompt, formatDiscordPromptTime, type DiscordMessageContextPromptOptions, type DiscordPromptScope, type DiscordPromptTimeFormatOptions, } from "./prompt-context";
 export { loadDiscordGatewayConfigFromEnv, resolveConfig } from "./config";
-export type { AgentStatus, DiscordGateway, DiscordGatewayConfig, PromptTransform, ResolvedDiscordGatewayConfig, } from "./types";
+export type { AgentStatus, DiscordGateway, DiscordGatewayConfig, PromptTransform, ResolvedDiscordGatewayConfig, GatewayAccessConfig, } from "./types";
 /**
  * Start the unified Discord gateway. Supports DM and forum thread sessions
  * out of the box. Set discordAllowedForumChannelIds to enable forum support.

package/dist/index.js

@@ -557,11 +557,11 @@ class AgentService {
 import path2 from "node:path";
 import dotenv from "dotenv";
 function resolveConfig(config) {
-  const discordAllowedUserId = readRequiredValue("discordAllowedUserId", config.discordAllowedUserId);
+  const discordAllowedUserId = requireNonEmptyConfigValue("discordAllowedUserId", config.discordAllowedUserId);
   return {
-    discordBotToken: readRequiredValue("discordBotToken", config.discordBotToken),
+    discordBotToken: requireNonEmptyConfigValue("discordBotToken", config.discordBotToken),
     discordAllowedUserId,
-    cwd: readRequiredValue("cwd", config.cwd),
+    cwd: requireNonEmptyConfigValue("cwd", config.cwd),
     agentDir: config.agentDir?.trim() || path2.join(config.cwd, ".pi-agent"),
     modelProvider: config.modelProvider?.trim() || "openrouter",
     modelId: config.modelId?.trim() || "anthropic/claude-3.5-haiku",
@@ -596,7 +596,7 @@ function loadDiscordGatewayConfigFromEnv(overrides = {}) {
     discordAllowedUserIds: overrides.discordAllowedUserIds ?? parseStringArrayFromEnv("DISCORD_ALLOWED_USER_IDS")
   });
 }
-function readRequiredValue(name, value) {
+function requireNonEmptyConfigValue(name, value) {
   const trimmedValue = value.trim();
   if (!trimmedValue) {
     throw new Error(`Missing required config value: ${name}`);
@@ -651,7 +651,7 @@ import {
   Partials
 } from "discord.js";
 
-// src/commands.ts
+// src/session-commands.ts
 function getSessionStatusText(session, promptQueue, extras) {
   const model = session.model ? `${session.model.provider}/${session.model.id}` : "(no model selected)";
   const contextUsage = session.getContextUsage();
@@ -881,7 +881,7 @@ var commandHandlers = [
   handleReloadCommand,
   handleResetSessionCommand
 ];
-async function executeCommand(input, context) {
+async function executeSessionCommand(input, context) {
   const trimmedInput = input.trim();
   if (!trimmedInput.startsWith("!")) {
     return { handled: false };
@@ -1055,9 +1055,9 @@ function resolveMessageScope(message) {
   }
   return null;
 }
-function isAuthorizedMessage(message, scope, authConfig) {
+function isAuthorizedMessage(message, scope, accessConfig) {
   if (scope === "dm") {
-    return message.author.id === authConfig.discordAllowedUserId;
+    return message.author.id === accessConfig.discordAllowedUserId;
   }
   if (scope.startsWith("thread:")) {
     const channel = message.channel;
@@ -1065,10 +1065,10 @@ function isAuthorizedMessage(message, scope, authConfig) {
       return false;
     }
     const parentId = channel.parentId;
-    if (!parentId || !authConfig.discordAllowedForumChannelIds.includes(parentId)) {
+    if (!parentId || !accessConfig.discordAllowedForumChannelIds.includes(parentId)) {
       return false;
     }
-    return authConfig.discordAllowedUserIds.includes(message.author.id);
+    return accessConfig.discordAllowedUserIds.includes(message.author.id);
   }
   return false;
 }
@@ -1150,8 +1150,8 @@ async function sendReply(message, text) {
   }
 }
 
-// src/image-description.ts
-var logger8 = createModuleLogger("image-description");
+// src/media-description.ts
+var logger8 = createModuleLogger("media-description");
 async function describeMediaAttachment(agentService, imageData, mimeType, userText, visionModel) {
   const session = await agentService.createTemporarySession();
   await session.setModel(visionModel);
@@ -1455,7 +1455,7 @@ function buildDiscordPromptContent(message, scope, content, config) {
     forumChannelId: isThread ? message.channel.parentId : undefined
   });
 }
-async function handleDiscordMessage(message, config, agentService, sessionRegistry, authConfig) {
+async function handleDiscordMessage(message, config, agentService, sessionRegistry, accessConfig) {
   if (message.author.bot) {
     logger11.debug("ignored bot message");
     return;
@@ -1472,7 +1472,7 @@ async function handleDiscordMessage(message, config, agentService, sessionRegist
     }, "unsupported channel type, ignoring");
     return;
   }
-  if (!isAuthorizedMessage(message, scope, authConfig)) {
+  if (!isAuthorizedMessage(message, scope, accessConfig)) {
     logger11.debug({
       messageId: message.id,
       authorId: message.author.id,
@@ -1516,7 +1516,7 @@ ${attachment.content}`;
       threadName: message.channel.name
     }, "new thread session");
   }
-  const commandResult = await executeCommand(content, {
+  const commandResult = await executeSessionCommand(content, {
     agentService,
     promptQueue,
     session
@@ -1586,7 +1586,7 @@ ${attachment.content}`;
 
 // src/discord-gateway-client.ts
 var logger12 = createModuleLogger("discord-gateway");
-async function startGatewayClient(config, agentService, sessionRegistry, authConfig) {
+async function startGatewayClient(config, agentService, sessionRegistry, accessConfig) {
   const client = new Client({
     intents: [
       GatewayIntentBits.DirectMessages,
@@ -1598,15 +1598,15 @@ async function startGatewayClient(config, agentService, sessionRegistry, authCon
   });
   client.once(Events.ClientReady, async (readyClient) => {
     logger12.info({ userTag: readyClient.user.tag }, "logged in");
-    if (!authConfig.startupMessage) {
+    if (!accessConfig.startupMessage) {
       return;
     }
     try {
-      const user = await readyClient.users.fetch(authConfig.discordAllowedUserId);
+      const user = await readyClient.users.fetch(accessConfig.discordAllowedUserId);
       const dmChannel = await user.createDM();
-      await dmChannel.send(authConfig.startupMessage);
+      await dmChannel.send(accessConfig.startupMessage);
       logger12.info({
-        userId: authConfig.discordAllowedUserId
+        userId: accessConfig.discordAllowedUserId
       }, "sent startup dm");
     } catch (error) {
       logger12.error({ error }, "failed to send startup dm");
@@ -1614,7 +1614,7 @@ async function startGatewayClient(config, agentService, sessionRegistry, authCon
   });
   client.on(Events.MessageCreate, async (message) => {
     try {
-      await handleDiscordMessage(message, config, agentService, sessionRegistry, authConfig);
+      await handleDiscordMessage(message, config, agentService, sessionRegistry, accessConfig);
     } catch (error) {
       logger12.error({ error, direction: "IN" }, "message handling failed");
       await sendReply(message, "The bot hit an error while handling that message.");
@@ -1743,14 +1743,14 @@ async function startDiscordGateway(config) {
   logger14.info("initializing agent service");
   await agentService.initialize();
   logger14.info(agentService.getStatus(), "agent ready");
-  const authConfig = {
+  const accessConfig = {
     discordAllowedUserId: resolvedConfig.discordAllowedUserId,
     discordAllowedForumChannelIds: resolvedConfig.discordAllowedForumChannelIds,
     discordAllowedUserIds: resolvedConfig.discordAllowedUserIds,
     startupMessage: resolvedConfig.startupMessage
   };
   const sessionRegistry = new SessionRegistry(agentService);
-  const client = await startGatewayClient(resolvedConfig, agentService, sessionRegistry, authConfig);
+  const client = await startGatewayClient(resolvedConfig, agentService, sessionRegistry, accessConfig);
   const stop = createGatewayStopHandler(client, agentService, sessionRegistry, resolvedConfig);
   if (resolvedConfig.shutdownOnSignals) {
     registerSignalHandlers(stop);

package/dist/{commands.d.ts → session-commands.d.ts}

@@ -12,4 +12,4 @@ export type CommandContext = {
     promptQueue: PromptQueue;
     session?: AgentSession;
 };
-export declare function executeCommand(input: string, context: CommandContext): Promise<CommandResult>;
+export declare function executeSessionCommand(input: string, context: CommandContext): Promise<CommandResult>;

package/dist/session-registry.d.ts

@@ -2,7 +2,7 @@ import type { AgentSession } from "@earendil-works/pi-coding-agent";
 import type { AgentService } from "./agent-service";
 import { PromptQueue } from "./prompt-queue";
 export type SessionScope = string;
-export type ScopeEntry = {
+export type ScopedSessionEntry = {
     session: AgentSession;
     promptQueue: PromptQueue;
     createdAt: Date;
@@ -19,11 +19,11 @@ export declare class SessionRegistry {
     private readonly agentService;
     constructor(agentService: AgentService);
     getOrCreate(scope: SessionScope): Promise<{
-        entry: ScopeEntry;
+        entry: ScopedSessionEntry;
         created: boolean;
     }>;
     remove(scope: SessionScope): Promise<void>;
-    get(scope: SessionScope): ScopeEntry | undefined;
+    get(scope: SessionScope): ScopedSessionEntry | undefined;
     getScopes(): SessionScope[];
     shutdownAll(): Promise<void>;
 }

package/dist/types.d.ts

@@ -57,6 +57,12 @@ export type AgentStatus = {
     contextUsage: ContextUsageStatus | undefined;
     thinkingInfo: string;
 };
+export type GatewayAccessConfig = {
+    discordAllowedUserId: string;
+    discordAllowedForumChannelIds: string[];
+    discordAllowedUserIds: string[];
+    startupMessage: string | false;
+};
 export type DiscordGateway = {
     client: Client;
     stop: () => Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@friendlyrobot/discord-pi-agent",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Reusable Discord gateway for persistent pi agent sessions",
   "license": "MIT",
   "type": "module",