parse

src/lib/components/PicletGenerator/PicletGenerator.svelte

@@ -362,12 +362,13 @@ CRITICAL RULES:
       workflowState.picletConcept = responseText;
 
       // Extract and store canonical name and variation immediately for use in other steps
-      const canonicalMatch = responseText.match(/# Canonical Object\s*\n([\s\S]*?)(?=^#)/m);
-      const variationMatch = responseText.match(/# Variation\s*\n([\s\S]*?)(?=^#)/m);
+      // Handle both plain and bold markdown headers
+      const canonicalMatch = responseText.match(/\*{0,2}#\s*Canonical Object\s*\*{0,2}\s*\n([\s\S]*?)(?=^\*{0,2}#)/m);
+      const variationMatch = responseText.match(/\*{0,2}#\s*Variation\s*\*{0,2}\s*\n([\s\S]*?)(?=^\*{0,2}#)/m);
 
       workflowState.objectName = canonicalMatch ? canonicalMatch[1].trim().toLowerCase() : 'unknown';
       const variationText = variationMatch ? variationMatch[1].trim() : '';
-      workflowState.objectAttributes = variationText && variationText !== 'NONE' ? [variationText.toLowerCase()] : [];
+      workflowState.objectAttributes = variationText && variationText !== 'NONE' && variationText !== 'canonical' ? [variationText.toLowerCase()] : [];
 
       console.log('Parsed specific object:', workflowState.objectName);
       console.log('Parsed variation:', workflowState.objectAttributes);
@@ -417,8 +418,8 @@ CRITICAL RULES:
       throw new Error('Text generation service not available or no concept/caption available for prompt generation');
     }
     
-    // Extract the Monster Image Prompt from the structured concept
-    const imagePromptMatch = workflowState.picletConcept.match(/# Monster Image Prompt\s*\n([\s\S]*?)(?=^#|$)/m);
+    // Extract the Monster Image Prompt from the structured concept (handle both plain and bold markdown headers)
+    const imagePromptMatch = workflowState.picletConcept.match(/\*{0,2}#\s*Monster Image Prompt\s*\*{0,2}\s*\n([\s\S]*?)(?=^\*{0,2}#|$)/m);
     
     if (imagePromptMatch && imagePromptMatch[1]) {
       workflowState.imagePrompt = imagePromptMatch[1].trim();
@@ -522,8 +523,8 @@ Create a concise visual description (1-3 sentences, max 100 words). Focus only o
     }
 
     try {
-      // Extract monster name
-      const monsterNameMatch = workflowState.picletConcept.match(/# Monster Name\s*\n([\s\S]*?)(?=^#|$)/m);
+      // Extract monster name (handle both plain and bold markdown headers)
+      const monsterNameMatch = workflowState.picletConcept.match(/\*{0,2}#\s*Monster Name\s*\*{0,2}\s*\n([\s\S]*?)(?=^\*{0,2}#|$)/m);
       let monsterName = monsterNameMatch ? monsterNameMatch[1].trim() : 'Unknown Monster';
 
       // Clean and truncate name
@@ -535,8 +536,8 @@ Create a concise visual description (1-3 sentences, max 100 words). Focus only o
       }
       monsterName = monsterName.replace(/\*/g, ''); // Remove markdown asterisks
 
-      // Extract rarity and convert to tier
-      const rarityMatch = workflowState.picletConcept.match(/# Object Rarity\s*\n([\s\S]*?)(?=^#)/m);
+      // Extract rarity and convert to tier (handle both plain and bold markdown headers)
+      const rarityMatch = workflowState.picletConcept.match(/\*{0,2}#\s*Object Rarity\s*\*{0,2}\s*\n([\s\S]*?)(?=^\*{0,2}#)/m);
       const objectRarity = rarityMatch ? rarityMatch[1].trim().toLowerCase() : 'common';
 
       let tier: 'low' | 'medium' | 'high' | 'legendary' = 'medium';
@@ -545,20 +546,20 @@ Create a concise visual description (1-3 sentences, max 100 words). Focus only o
       else if (objectRarity.includes('rare')) tier = 'high';
       else if (objectRarity.includes('legendary') || objectRarity.includes('mythical')) tier = 'legendary';
 
-      // Extract primary type
-      const primaryTypeMatch = workflowState.picletConcept.match(/# Primary Type\s*\n([\s\S]*?)(?=^#|$)/m);
+      // Extract primary type (handle both plain and bold markdown headers)
+      const primaryTypeMatch = workflowState.picletConcept.match(/\*{0,2}#\s*Primary Type\s*\*{0,2}\s*\n([\s\S]*?)(?=^\*{0,2}#|$)/m);
       let primaryType: any = primaryTypeMatch ? primaryTypeMatch[1].trim().toLowerCase() : 'beast';
 
-      // Extract description
-      const descriptionMatch = workflowState.picletConcept.match(/# Monster Description\s*\n([\s\S]*?)(?=^#|$)/m);
+      // Extract description (handle both plain and bold markdown headers)
+      const descriptionMatch = workflowState.picletConcept.match(/\*{0,2}#\s*Monster Description\s*\*{0,2}\s*\n([\s\S]*?)(?=^\*{0,2}#|$)/m);
       if (!descriptionMatch) {
         console.error('Monster description not found in concept:', workflowState.picletConcept);
         throw new Error('Failed to extract monster description from AI response');
       }
       let description = descriptionMatch[1].trim();
 
-      // Extract physical stats
-      const physicalStatsMatch = workflowState.picletConcept.match(/# Physical Stats\s*\n([\s\S]*?)(?=^#|$)/m);
+      // Extract physical stats (handle both plain and bold markdown headers)
+      const physicalStatsMatch = workflowState.picletConcept.match(/\*{0,2}#\s*Physical Stats\s*\*{0,2}\s*\n([\s\S]*?)(?=^\*{0,2}#|$)/m);
       let height: string | undefined;
       let weight: string | undefined;
 
@@ -571,8 +572,8 @@ Create a concise visual description (1-3 sentences, max 100 words). Focus only o
         weight = weightMatch ? weightMatch[1].trim() : undefined;
       }
 
-      // Extract personality
-      const personalityMatch = workflowState.picletConcept.match(/# Personality\s*\n([\s\S]*?)(?=^#|$)/m);
+      // Extract personality (handle both plain and bold markdown headers)
+      const personalityMatch = workflowState.picletConcept.match(/\*{0,2}#\s*Personality\s*\*{0,2}\s*\n([\s\S]*?)(?=^\*{0,2}#|$)/m);
       let personality = personalityMatch ? personalityMatch[1].trim() : undefined;
 
       // Create stats with physical characteristics
@@ -634,15 +635,11 @@ Create a concise visual description (1-3 sentences, max 100 words). Focus only o
 
       const picletInstance = await generatedDataToPicletInstance(
         picletData,
-        workflowState.objectName,
+        workflowState.objectName || undefined,
         variation,
         workflowState.objectAttributes
       );
-      
-      // Override the caught status to auto-capture scanned Piclets
-      picletInstance.caught = true;
-      picletInstance.caughtAt = new Date();
-      
+
       const picletId = await savePicletInstance(picletInstance);
       console.log('Piclet auto-saved as caught with ID:', picletId);
     } catch (err) {
@@ -668,20 +665,14 @@ Create a concise visual description (1-3 sentences, max 100 words). Focus only o
       imagePrompt: null,
       picletImage: null,
       error: null,
-      isProcessing: false
+      isProcessing: false,
+      objectName: null,
+      objectAttributes: [],
+      visualDetails: null,
+      discoveryStatus: null,
+      canonicalPiclet: null
     };
   }
-  
-  // Public method for trainer scanner to queue trainer images
-  export function queueTrainerImage(imageFile: File, imagePath: string) {
-    imageQueue.push(imageFile);
-    trainerImagePaths.push(imagePath);
-    
-    // If this is the first image and we're not processing, start processing
-    if (imageQueue.length === 1 && !workflowState.isProcessing) {
-      processCurrentImage();
-    }
-  }
 </script>
 
 <div class="piclet-generator">