Merge pull request #45 from georgeistes/ui-ux-patch-3

Change WS port and update JSON parsing

Author: supreme-gg-gg

live2d-container/main.js

@@ -15,7 +15,7 @@ const path = require('path');
 const USE_WEBSOCKET = app.commandLine.getSwitchValue("use-websocket") === "false" ? false : true;
 
 let mainWindow;
-const WS_PORT = 3000;
+const WS_PORT = 54321;
 let ws = null;
 
 function showWelcomeMessage() {

src/agents/cheerleader_agent.ts

@@ -13,11 +13,6 @@ import { CommentHandler } from './action_handlers/comment_handler';
 import { ExplainHandler } from './action_handlers/explain_handler';
 import { HighlightHandler } from './action_handlers/highlight_handler';
 
-/**
- * Abstract base class for all Cheerleader agents.
- * It encapsulates common functionality for text and voice interactions.
- * 
- */
 /**
  * An abstract base class representing a Cheerleader Agent that provides interactive code assistance.
  * This class handles both voice and text-based interactions, manages action handlers, and processes AI responses.
@@ -230,34 +225,44 @@ export abstract class CheerleaderAgent {
    * @param response AI response string.
    */
   private parseResponse(response: string): BasicCheerleaderAction[] {
-    // Find start of JSON block
-    const startIndex = response.indexOf("```json");
-    if (startIndex === -1) {
-      console.debug("No JSON block found in response");
-      return [{
-        action: "conversation",
-        content: response.trim()
-      }];
-    }
+    try {
+      // Sanitize input
+      const sanitizedResponse = response.trim();
+      
+      // Find JSON block boundaries
+      const jsonBlockMatch = sanitizedResponse.match(/```json\s*([\s\S]*?)\s*```/);
+      
+      // If the response fails or parsing fails, do not return the block as response
+      // but throw an error instead. This is because it will be wasting TTS token
+      // and the user will not be able to see the error message.
+      if (!jsonBlockMatch) {
+        throw new Error("No JSON block found in response"); 
+      }
 
-    // Remove markdown formatting
-    const jsonStart = response.indexOf("[", startIndex);
-    let jsonContent = response.substring(jsonStart);
-    const blockEnd = jsonContent.indexOf("```");
-    if (blockEnd !== -1) {
-      jsonContent = jsonContent.substring(0, blockEnd);
-    }
+      // Extract JSON content from the matched block
+      const jsonContent = jsonBlockMatch[1].trim();
+      
+      if (!jsonContent) {
+        throw new Error("Empty JSON block found");
+      }
 
-    // Parse JSON
-    try {
+      // Parse JSON with validation
       const actions = JSON.parse(jsonContent);
+      
+      // Validate that actions is an array
+      if (!Array.isArray(actions)) {
+        throw new Error("Parsed JSON is not an array");
+      }
+
       console.debug("Successfully parsed JSON array:", actions);
       return actions;
+      
     } catch (e) {
-      console.debug("JSON parse error:", e);
+      console.error("JSON parse error:", e);
+      // Return the original response as conversation if parsing fails
       return [{
         action: "conversation",
-        content: response.trim()
+        content: "Oops! There was an error handling the AI response."
       }];
     }
   }

src/agents/inline_chat_agent.ts

@@ -1,7 +1,10 @@
 import { TextEditor } from 'vscode';
 import { CheerleaderAgent } from './cheerleader_agent';
 
-const INLINE_CHAT_PROMPT = `Guide users to understand code rather than solving problems directly. YOUR RESPONSE MUST BE A VALID JSON ARRAY using this format:
+const INLINE_CHAT_PROMPT = `Guide users to understand code rather than solving problems directly. YOUR RESPONSE MUST BE A VALID JSON ARRAY of the following actions,
+    but you do NOT need to use all the actions, only use the ones that are relevant and do not include the actions if they do not help solve the problem.
+    For example, if the user asks a general question, you only need to use the "conversation" action.
+
     \`\`\`json
     [
         {
@@ -27,10 +30,12 @@ const INLINE_CHAT_PROMPT = `Guide users to understand code rather than solving p
         }
     ]
     \`\`\`
+
     If you need to include diagrams in your explanation, use the following syntax:
     \`\`\`mermaid
     <mermaid_diagram_here>
     \`\`\`
+    
     Always start with a conversational response, then add necessary actions. Focus on teaching patterns and concepts.`;
 
 /**

src/agents/rubber_duck_agent.ts

@@ -42,8 +42,10 @@ When the problem is solved, respond with:
 `;
 
 /**
- * RubberDuckAgent specializes in debugging through conversation.
- * It maintains a continuous dialogue until the problem is solved.
+ * "You must stay vigilant against the temptation of vibe coding by Daisy Duck",
+ * commanded George to his followers. "For this reason, I shall gift you with a
+ * rubber duck, a symbol of our commitment to the art of debugging."
+ * -- The Georgeiste Manifesto, Chapter 3, Verse 5
  */
 export class RubberDuckAgent extends CheerleaderAgent {
   private isSolved: boolean = false;

src/services/websocket_service.ts

@@ -6,7 +6,7 @@ export class WebSocketService {
   private static instance: WebSocketService;
   private wss: WebSocket.Server | null = null;
   private ws: WebSocket.WebSocket | null = null;
-  private readonly WS_PORT = 3000;
+  private readonly WS_PORT = 54321;
 
   private constructor() {}