@space3-npm/cybersoul-client 1.4.24 → 1.4.26

package/dist/client.js

@@ -479,7 +479,8 @@ ${isProactive
         return `When generating a triggerEvent, you MUST provide a suitable 'triggerEvent.outfitId' if the VERY LAST USER MESSAGE explicitly asks for an outfit change, OR if the new activity implies a context/location shift that conflicts with the current outfit (e.g., currently in SLEEPWEAR at home but going outside). Otherwise, keep it null. When changing outfits, match it to the event's activity, environment, and relationship stage (e.g., CASUAL, COSTUME, INTIMATE, SLEEPWEAR, etc.).`;
     }
     getTriggerEventPolicyPrompt() {
-        return `- Include 'triggerEvent' only if the VERY LAST USER MESSAGE proposes a new activity/hangout AND you accept the invitation, explicitly requests an outfit change AND you agree, or proposes intimate/romantic actions AND you agree; ignore older history. DO NOT include it if you decline or reject the proposal. ${this.getOutfitSelectionPrompt()}`;
+        return `- Include 'triggerEvent' only if the VERY LAST USER MESSAGE proposes a new activity/hangout AND you accept the invitation, explicitly requests an outfit change AND you agree, or proposes intimate/romantic actions AND you agree; ignore older history. DO NOT include it if you decline or reject the proposal.
+    REPETITION GATE (hard): Prior assistant turns that already auto-triggered an event are tagged with a [Triggered Event: ...] marker in '[CHAT HISTORY]'. If such a marker already exists for the SAME activity the VERY LAST USER MESSAGE is referring to (e.g. it is just acknowledging, hurrying, confirming, or continuing an already-accepted outing), set 'triggerEvent' to null. Only emit a NEW 'triggerEvent' when the user proposes a genuinely DIFFERENT activity that has not already been triggered. Do NOT re-trigger the same event just because the conversation continues. ${this.getOutfitSelectionPrompt()}`;
     }
     getOutfitAcquisitionPolicyPrompt() {
         return `- Outfit acquisition (giftOutfit): set 'giftOutfit' to { "descriptionText": "short outfit description" } when a genuinely NEW outfit (one that is NOT already in the Available Wardrobe) is obtained THIS turn, triggered by EITHER:
@@ -665,7 +666,8 @@ ${isProactive
             const content = typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content);
             const action = msg.actionText ? ` (${msg.actionText})` : "";
             const media = msg.mediaHint ? ` [${msg.mediaHint}]` : "";
-            contextLines.push(`${speaker}:${action} ${content}${media}`);
+            const event = msg.eventHint ? ` [Triggered Event: ${msg.eventHint}]` : "";
+            contextLines.push(`${speaker}:${action} ${content}${media}${event}`);
         }
         return contextLines.join('\n');
     }
@@ -807,21 +809,49 @@ Note: Always include "isEndTurn". If "imageParams", "voiceArgs", "triggerEvent",
                         "\n\nReturn only valid JSON matching the schema. Escape newlines inside JSON strings with \\n. Keep imageParams values in ENGLISH and use the provided enums.",
                 },
             ];
-            // 3. Local Execute LLM
-            const rawLlmResponse = await this.llm.generate(promptMessages, 15000, 0.7);
-            // console.debug("[CyberSoulClient] Raw LLM Response:", rawLlmResponse);
-            let parsedIntent;
-            try {
-                parsedIntent = robustJsonParse(rawLlmResponse, "Dispatcher fallback", { textResponse: "", actionText: "", isEndTurn: false });
+            // 3. Local Execute LLM (retry on non-actionable parse).
+            //    A "non-actionable" parse yields no usable `textResponse` AND no
+            //    media intent — i.e. the LLM hiccuped (empty body, truncated or
+            //    garbled JSON, or an empty textResponse field). Retrying the
+            //    generation is far better than silently echoing the user's own
+            //    message back as the character's reply (the historical
+            //    `: params.userMessage` fallback below), which downstream
+            //    consumers correctly reject as a non-actionable response.
+            const MAX_DISPATCH_ATTEMPTS = 3;
+            let parsedIntent = { textResponse: "" };
+            for (let attempt = 1; attempt <= MAX_DISPATCH_ATTEMPTS; attempt++) {
+                const rawLlmResponse = await this.llm.generate(promptMessages, 15000, 0.7);
+                // console.debug("[CyberSoulClient] Raw LLM Response:", rawLlmResponse);
+                try {
+                    parsedIntent = robustJsonParse(rawLlmResponse, "Dispatcher fallback", { textResponse: "", actionText: "", isEndTurn: false });
+                }
+                catch (e) {
+                    console.warn("[CyberSoulClient] JSON parse failed, falling back to raw text:", e);
+                    // Fallback robust mode - just text if completely broken
+                    parsedIntent = {
+                        textResponse: rawLlmResponse.replace(/^[\`\s]+|[\`\s]+$/g, "").trim(),
+                    };
+                }
+                // console.debug("[CyberSoulClient] Parsed Intent:", parsedIntent);
+                const hasUsableText = typeof parsedIntent.textResponse === "string" &&
+                    parsedIntent.textResponse.trim().length > 0;
+                const hasMediaIntent = !!parsedIntent.imageParams || !!parsedIntent.voiceArgs;
+                if (hasUsableText || hasMediaIntent) {
+                    break;
+                }
+                console.warn(`[CyberSoulClient] interact produced a non-actionable intent (attempt ${attempt}/${MAX_DISPATCH_ATTEMPTS}); ${attempt < MAX_DISPATCH_ATTEMPTS ? "retrying" : "giving up"}.`);
             }
-            catch (e) {
-                console.warn("[CyberSoulClient] JSON parse failed, falling back to raw text:", e);
-                // Fallback robust mode - just text if completely broken
-                parsedIntent = {
-                    textResponse: rawLlmResponse.replace(/^[\`\s]+|[\`\s]+$/g, "").trim(),
-                };
+            // After exhausting retries, fail fast instead of echoing the user's
+            // own message back as the character's reply. The `: params.userMessage`
+            // fallback used below is only ever reached for media-only turns now.
+            {
+                const finalHasUsableText = typeof parsedIntent.textResponse === "string" &&
+                    parsedIntent.textResponse.trim().length > 0;
+                const finalHasMediaIntent = !!parsedIntent.imageParams || !!parsedIntent.voiceArgs;
+                if (!finalHasUsableText && !finalHasMediaIntent) {
+                    throw new Error("LLM returned a non-actionable response after retries (no usable textResponse and no media intent). Check LLM template/provider alignment.");
+                }
             }
-            // console.debug("[CyberSoulClient] Parsed Intent:", parsedIntent);
             // 4. Update Backend State async (in parallel with media generation
             //    below). We keep the promise so we can resolve the
             //    server-authoritative `temperature` / `relationshipStage` and

package/dist/types.d.ts

@@ -31,6 +31,14 @@ export interface HistoryEntry {
     content: string;
     actionText?: string;
     mediaHint?: string;
+    /**
+     * Marker for assistant turns that already auto-triggered an event
+     * (e.g. an outing/hangout the character accepted). Surfaced in the
+     * transcript as a `[Triggered Event: ...]` tag so the dispatcher's
+     * trigger-event repetition gate can avoid re-triggering the same
+     * activity on later turns. Mirrors how `mediaHint` tags past media.
+     */
+    eventHint?: string;
     isProactive?: boolean;
     timestamp?: string | number | Date;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@space3-npm/cybersoul-client",
-  "version": "1.4.24",
+  "version": "1.4.26",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",