briyah 1.1.8 → 1.2.1

package/dist-sdk/server/src/room/room.js

@@ -201,19 +201,14 @@ class Room {
         let normalizedAction;
         if (typeof response !== 'object') {
             needsModeration = true;
-            const lines = response.split('\n');
-            for (const line of lines) {
-                const trimmedLine = line.trim();
-                if (trimmedLine.startsWith('# Situation:')) {
-                    situation = trimmedLine.substring('# Situation:'.length).trim();
-                    content = lines
-                        .filter((l) => !l.startsWith('# Situation:'))
-                        .join('\n')
-                        .trimStart();
-                    break;
-                }
+            const parsed = Room.extractPreamble(response);
+            if (parsed) {
+                situation = parsed.preamble;
+                content = parsed.content;
+            }
+            else {
+                situation = undefined;
             }
-            situation = situation || undefined;
         }
         else if (!response.content) {
             needsModeration = true;
@@ -244,11 +239,31 @@ class Room {
         }
         situation = response.situation || undefined;
         const msg = new message_1.RoomMessage(agent.agentNickname, normalizedAction, response.content, targets, response.name, situation);
-        if (Array.isArray(response.update_portrait) && response.update_portrait.length > 0) {
-            msg.updatePortrait = response.update_portrait;
+        if (response.changes && typeof response.changes === 'object') {
+            msg.changes = response.changes;
         }
         return msg;
     }
+    static extractPreamble(response) {
+        const lines = response.split('\n');
+        let i = 0;
+        while (i < lines.length && lines[i].trim() === '')
+            i++;
+        const tagLineRe = /^\s*<\w+>[\s\S]*?<\/\w+>\s*$/;
+        if (i >= lines.length || !tagLineRe.test(lines[i]))
+            return null;
+        const preambleLines = [];
+        let j = i;
+        while (j < lines.length && tagLineRe.test(lines[j])) {
+            preambleLines.push(lines[j].trim());
+            j++;
+        }
+        const preamble = preambleLines.join('\n');
+        if (j < lines.length && lines[j].trim() === '')
+            j++;
+        const content = lines.slice(j).join('\n').trimStart();
+        return { preamble, content };
+    }
     static coerceMessageAction(raw) {
         if (typeof raw !== 'string')
             return undefined;
@@ -324,6 +339,13 @@ class Room {
     async moderate(moderatorAgent, message, onResponse) {
         const humanAgent = this.getAgents().find((agent) => agent.isControlledByHuman);
         const humanAgentName = humanAgent ? humanAgent.agentNickname : 'Player';
+        const visibleArtifacts = this.getVisibleArtifacts(moderatorAgent.agentNickname)
+            .map((a) => `${a.name} (by ${a.creator}): ${a.body}`)
+            .join('\n\n');
+        const invisibleArtifactNames = this.getArtifacts()
+            .filter((a) => !this.getVisibleArtifacts(moderatorAgent.agentNickname).includes(a))
+            .map((a) => a.name)
+            .join(', ');
         const variables = {
             agentName: moderatorAgent.agentName,
             agentNickname: moderatorAgent.agentNickname || moderatorAgent.agentName,
@@ -335,6 +357,8 @@ class Room {
             scenario: this.getGoal(),
             humanAgent: humanAgent,
             humanAgentName: humanAgentName,
+            visibleArtifacts: visibleArtifacts,
+            invisibleArtifactNames: invisibleArtifactNames,
         };
         let prompt = `
 Current Situation: ${this.getSituation()}
@@ -648,11 +672,11 @@ Recent Message: ${message.getContent()}
                 originalMessage.content = content;
             }
             if (this.checkAgentNicknameMatch(originalMessage.sender, responderNickname)) {
-                let responder = this.getHumanAgentName();
-                if (!responder)
-                    responder = roomLeaderName;
-                this.setCurrentSpeaker(responder);
-                logger_1.logger.warn(`Moderator routed message to sender: ${originalMessage.sender}. Setting responder to room leader: ${responder}`);
+                logger_1.logger.warn(`Moderator routed message to sender: ${originalMessage.sender}. Reassigning responder to room leader: ${roomLeaderName}`);
+                responderNickname = roomLeaderName;
+                moderatorMessage.name = roomLeaderName;
+                if (!targets.includes(roomLeaderName))
+                    targets.push(roomLeaderName);
             }
             logger_1.logger.log(`Moderator routing: sender=${originalMessage.sender} action=${moderatorMessage.action}, name=${responderNickname}, targets=${targets.join(', ')}`);
             if (moderatorMessage.action === app_types_1.MessageAction.RELAY) {

package/dist-sdk/server/src/sdk/briyah-config.d.ts

@@ -1,9 +1,10 @@
-import { IConfigService } from '../app/user-service-manager';
+import { IConfigService } from '../config/env-config';
 export interface LoggingOptions {
     enabled?: boolean;
     logFile?: string;
     console?: boolean;
     level?: 'debug' | 'log' | 'warn' | 'error';
+    aiDebug?: boolean;
 }
 export interface BriyahConfigOptions {
     dataPath?: string;

package/dist-sdk/server/src/sdk/briyah-config.js

@@ -23,6 +23,10 @@ class BriyahConfigService {
             this.env.DEFAULT_MARKUP_RATE = String(options.markupRate);
             process.env.DEFAULT_MARKUP_RATE = String(options.markupRate);
         }
+        if (options?.logging?.aiDebug) {
+            this.env.AI_DEBUG = 'true';
+            process.env.AI_DEBUG = 'true';
+        }
     }
     get(key, defaultValue) {
         const value = this.env[key];

package/dist-sdk/server/src/sdk/briyah.js

@@ -115,7 +115,7 @@ class Briyah {
         this.balanceMessageService = new balance_message_service_1.BalanceMessageService();
         this.publishedAgentsService = new published_agents_service_1.PublishedAgentsService();
         this.publishedRoomsService = new published_rooms_service_1.PublishedRoomsService();
-        this.userServiceFactory = new user_service_factory_1.UserServiceFactory(this.aiFactoryService, this.agentMessageService, this.roomMessageService, this.storyProgressService, this.storyMessageService, this.publishedAgentsService, this.publishedRoomsService, this.balanceMessageService);
+        this.userServiceFactory = new user_service_factory_1.UserServiceFactory(this.aiFactoryService, this.agentMessageService, this.roomMessageService, this.storyProgressService, this.storyMessageService, this.publishedAgentsService, this.publishedRoomsService, this.balanceMessageService, this.configService);
         this.userServiceManager = new user_service_manager_1.UserServiceManager(this.userServiceFactory, this.configService);
     }
     async init() {

package/dist-sdk/server/src/story/story-store.service.d.ts

@@ -1,12 +1,12 @@
-import { ConfigurationService } from '../config/configuration.service';
+import { UserPathsService } from '../config/user-paths.service';
 import { StoryInfo, ChapterInfo } from '../../../shared/types/app.types';
 import { RoomMessage } from '../room/message';
 import { RoomStoreService } from '../room/room-store.service';
 export declare class StoryStoreService {
-    private readonly configService;
+    private readonly userPaths;
     private readonly roomStore;
     private readonly storiesDir;
-    constructor(configService: ConfigurationService, roomStore: RoomStoreService);
+    constructor(userPaths: UserPathsService, roomStore: RoomStoreService);
     createStory(name: string): StoryInfo;
     getStory(id: string): StoryInfo | null;
     updateStoryMetadata(id: string, storyInfo: StoryInfo): boolean;

package/dist-sdk/server/src/story/story-store.service.js

@@ -45,19 +45,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StoryStoreService = void 0;
 const common_1 = require("@nestjs/common");
 const crypto_1 = require("crypto");
-const configuration_service_1 = require("../config/configuration.service");
+const user_paths_service_1 = require("../config/user-paths.service");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const room_store_service_1 = require("../room/room-store.service");
 const logger_1 = require("../common/logger");
 let StoryStoreService = class StoryStoreService {
-    configService;
+    userPaths;
     roomStore;
     storiesDir;
-    constructor(configService, roomStore) {
-        this.configService = configService;
+    constructor(userPaths, roomStore) {
+        this.userPaths = userPaths;
         this.roomStore = roomStore;
-        this.storiesDir = path.join(this.configService.getUserDataDir(), 'stories');
+        this.storiesDir = path.join(this.userPaths.getUserDataDir(), 'stories');
         if (!fs.existsSync(this.storiesDir)) {
             fs.mkdirSync(this.storiesDir, { recursive: true });
         }
@@ -426,6 +426,6 @@ let StoryStoreService = class StoryStoreService {
 exports.StoryStoreService = StoryStoreService;
 exports.StoryStoreService = StoryStoreService = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [configuration_service_1.ConfigurationService,
+    __metadata("design:paramtypes", [user_paths_service_1.UserPathsService,
         room_store_service_1.RoomStoreService])
 ], StoryStoreService);

package/dist-sdk/server/src/story/story.service.d.ts

@@ -7,7 +7,7 @@ import { Room } from '../room/room';
 import { RoomFactory } from '../room/room-factory';
 import { RoomStoreService } from '../room/room-store.service';
 import { StoryInfo, StoryState, Character } from '../../../shared/types/app.types';
-import { ConfigurationService } from '../config/configuration.service';
+import { UserPathsService } from '../config/user-paths.service';
 import { ArtifactService } from '../ai/artifact.service';
 import { Readable } from 'stream';
 export declare class StoryService {
@@ -16,12 +16,12 @@ export declare class StoryService {
     private readonly roomStore;
     private readonly progressService;
     private readonly messageService;
-    private readonly configService;
+    private readonly userPaths;
     private readonly agentFactory;
     private readonly roomFactory;
     private readonly storyArtifactServices;
     private readonly chaptersInProgress;
-    constructor(storyStore: StoryStoreService, agentStore: AgentStoreService, roomStore: RoomStoreService, progressService: StoryProgressService, messageService: StoryMessageService, configService: ConfigurationService, agentFactory: AgentFactory, roomFactory: RoomFactory);
+    constructor(storyStore: StoryStoreService, agentStore: AgentStoreService, roomStore: RoomStoreService, progressService: StoryProgressService, messageService: StoryMessageService, userPaths: UserPathsService, agentFactory: AgentFactory, roomFactory: RoomFactory);
     getProgressEmitter(storyId: string): import("node:events")<any>;
     getMessageEmitter(storyId: string): import("node:events")<any>;
     cleanupProgressEmitter(storyId: string): void;
@@ -77,14 +77,21 @@ export declare class StoryService {
     private compactAgentHistories;
     private extractMarkdownContent;
     private updatePlotPlan;
+    private publishInventoryArtifact;
+    private applyInventoryUpdates;
     private updateCharacterProfiles;
     private getImageModelConfig;
+    private getImagePropertiesForAgent;
     private createArtistAgent;
     private generateCharacterPortrait;
+    private generatePortraitForName;
     private updateCharacterPortrait;
     private generateSceneIllustration;
+    private ensureMinorCharacterPortraits;
     private generateSceneReference;
     private generateStoryImage;
+    private parseNarratorPreamble;
+    private formatDisplaySituation;
     private updateStorySituation;
     generateStoryMarkdown(storyId: string): Promise<string>;
     exportStoryData(storyId: string): Promise<{