Fix role labels (#21)

* fix: Fix role labels

* Add extra lines between operations

* update confirm terms

Author: googlicius

DEVELOP.md

@@ -70,3 +70,4 @@
       **Solution:** Either fine-tunning the content reading prompt to tell LLMs use correct tool params or
       include all content of any wikilinks along with the user query.
 - [x] The systemPrompts in the User-Defined command currently load content from wikilinks only one level (Need 2 levels to resolve content of wikilinks in the system prompt)
+- [ ] Double user messages in the actual generate.

src/lib/modelfusion/classifiers/intent.ts

@@ -176,11 +176,8 @@ export const intentClassifier = new PersistentEmbeddingSimilarityClassifier({
         'proceed',
         'cancel',
         'go ahead',
-        'stop',
         'i agree',
         'i disagree',
-        "that's correct",
-        "that's incorrect",
       ],
     },
     {

src/lib/modelfusion/extractions/contentReadingExtraction.ts

@@ -32,7 +32,7 @@ const contentReadingSchema = z.object({
     .string()
     .nullable()
     .describe(
-      `A short text to indicate that the content was found. Use {{number}} as a placeholder that will be replaced with an actual number later.
+      `A short text to indicate that the content was found. MUST include the term {{number}} as a placeholder, for example: "I found {{number}}..."
 If the readType is "entire", leave it null.`
     ),
   confidence: z.number().min(0).max(1).describe(confidenceFragment),

src/services/ConversationRenderer.ts

@@ -26,8 +26,8 @@ export class ConversationRenderer {
   /**
    * Formats role text based on the showPronouns setting
    */
-  private formatRoleText(role?: string, showLabel = false): string {
-    if (!role || !showLabel || !this.plugin.settings.showPronouns) {
+  private formatRoleText(role?: string, showLabel = this.plugin.settings.showPronouns): string {
+    if (!role || !showLabel) {
       return '';
     }
 

src/solutions/commands/handlers/ConfirmCommandHandler.ts

@@ -174,6 +174,9 @@ export class ConfirmCommandHandler extends CommandHandler {
       'create',
       'confirm',
       'proceed',
+      'go ahead',
+      'approve',
+      'agree',
       // Vietnamese affirmative terms
       'có',
       'có nha',
@@ -193,6 +196,8 @@ export class ConfirmCommandHandler extends CommandHandler {
       'dont',
       'cancel',
       'stop',
+      'reject',
+      'disagree',
       // Vietnamese negative terms
       'không',
       'không nha',

src/solutions/commands/handlers/CreateCommandHandler.ts

@@ -171,7 +171,6 @@ export class CreateCommandHandler extends CommandHandler {
             })}*`,
             artifactContent: createdNotes.join('\n\n'),
             command: 'create',
-            role: 'System',
             lang,
           });
         }

src/solutions/commands/handlers/GenerateCommandHandler.ts

@@ -151,23 +151,24 @@ The response should be in natural language and not include the selection(s) {{st
       };
     }
 
-    await this.renderer.addGeneratingIndicator(title, t('conversation.generating'));
-
     try {
+      const messageId = await this.renderer.updateConversationNote({
+        path: title,
+        newContent: extraction.explanation,
+        includeHistory: false,
+        role: 'Steward',
+        lang,
+      });
+
+      await this.renderer.addGeneratingIndicator(title, t('conversation.generating'));
+
       if ('updates' in extraction) {
         if (extraction.updates.length === 0) {
           return {
             status: CommandResultStatus.SUCCESS,
           };
         }
 
-        const messageId = await this.renderer.updateConversationNote({
-          path: title,
-          newContent: extraction.explanation,
-          includeHistory: false,
-          lang,
-        });
-
         if (messageId) {
           this.artifactManager.storeArtifact(title, messageId, {
             type: ArtifactType.CONTENT_UPDATE,
@@ -181,7 +182,6 @@ The response should be in natural language and not include the selection(s) {{st
               type: ArtifactType.CONTENT_UPDATE,
             })}*`,
             command: 'generate',
-            role: 'System',
             lang,
           });
         }
@@ -220,13 +220,14 @@ The response should be in natural language and not include the selection(s) {{st
             ...command,
             systemPrompts,
           },
-          conversationHistory,
+          conversationHistory: conversationHistory.slice(0, -1),
           errorCallback: async error => {
+            logger.error('Error in contentGenerationStream', error);
+
             if (error instanceof APICallError && error.statusCode === 422) {
               await this.renderer.updateConversationNote({
                 path: title,
                 newContent: `*Error: Unprocessable Content*`,
-                role: 'System',
               });
             }
           },
@@ -269,9 +270,6 @@ The response should be in natural language and not include the selection(s) {{st
         }
       }
 
-      // We no longer generate summaries after every generate command
-      // Summaries are now generated when users send follow-up queries in GeneralCommandHandler
-
       return {
         status: CommandResultStatus.SUCCESS,
       };

src/solutions/commands/handlers/ImageCommandHandler.ts

@@ -84,13 +84,11 @@ export class ImageCommandHandler extends CommandHandler {
           mediaType: 'image',
         });
 
-        // Add a System message with the artifact content
         const t = getTranslation(lang);
         await this.renderer.updateConversationNote({
           path: title,
           newContent: `*${t('common.artifactCreated', { type: ArtifactType.MEDIA_RESULTS })}*`,
           artifactContent: result.filePath,
-          role: 'System',
           command: 'image',
         });
       }

src/solutions/commands/handlers/ReadCommandHandler.ts

@@ -211,7 +211,6 @@ export class ReadCommandHandler extends CommandHandler {
           path: title,
           newContent: `*${t('common.artifactCreated', { type: ArtifactType.READ_CONTENT })}*`,
           artifactContent: readingResults[0].blocks.map(block => block.content).join('\n\n'),
-          role: 'System',
           command: 'read',
         });
       }

src/solutions/commands/handlers/SearchCommandHandler.ts

@@ -107,13 +107,19 @@ export class SearchCommandHandler extends CommandHandler {
               .getText();
             message += `- ${t('search.folders')}: ${escapedFolders}\n`;
           }
+
+          // Add an extra newline between operations except for the last one
+          if (index < queryExtraction.operations.length - 1) {
+            message += '\n';
+          }
         }
 
         await this.renderer.updateConversationNote({
           path: title,
           newContent: message,
           command: 'search',
           includeHistory: false,
+          role: 'Steward',
         });
 
         // Check if the next command will operate on the search results
@@ -183,7 +189,6 @@ export class SearchCommandHandler extends CommandHandler {
           })}*`,
           artifactContent,
           command: 'search',
-          role: 'System',
         });
       }