@axhub/genie 0.1.9 → 0.2.0

package/shared/conversationEvents.js

@@ -181,10 +181,49 @@ function createTextEndEvent({
   ];
 }
 
+function extractVisibleUserMessage(value) {
+  const text = String(value || '').trim();
+  if (!text) return '';
+
+  if (text.startsWith('# AGENTS.md instructions for ') || text.includes('<environment_context>')) {
+    return '';
+  }
+
+  if (text.startsWith('[DYNAMIC CONTEXT V1]')) {
+    const marker = '\n\n[USER MESSAGE]\n';
+    const markerIndex = text.indexOf(marker);
+    if (markerIndex >= 0) {
+      return text.slice(markerIndex + marker.length).trim();
+    }
+    return '';
+  }
+
+  const dynamicContextMatch = text.match(
+    /^<dynamic_context(?:\s[^>]*)?>[\s\S]*?<\/dynamic_context>\s*<user_message>\s*([\s\S]*?)\s*<\/user_message>$/i
+  );
+  if (dynamicContextMatch) {
+    return String(dynamicContextMatch[1] || '').trim();
+  }
+
+  return text;
+}
+
 function isHiddenSystemContextContent(value) {
   const text = String(value || '').trim();
   if (!text) return true;
-  return text.startsWith('[System Context]') || text.startsWith('[Attached Context]') || text.startsWith('[Dynamic Context]') || text.startsWith('[Hidden Context]');
+
+  if (
+    text.startsWith('[System Context]') ||
+    text.startsWith('[Attached Context]') ||
+    text.startsWith('[Dynamic Context]') ||
+    text.startsWith('[Hidden Context]') ||
+    text.startsWith('# AGENTS.md instructions for ') ||
+    text.startsWith('[DYNAMIC CONTEXT V1]')
+  ) {
+    return true;
+  }
+
+  return /^<dynamic_context(?:\s|>)/i.test(text) || text.includes('<environment_context>');
 }
 
 function stringifyToolContent(value) {
@@ -323,13 +362,14 @@ export function normalizeLegacyHistoryEntries(rawMessages = [], provider = 'clau
         content = typeof msg.message.content === 'string' ? msg.message.content : String(msg.message.content || '');
       }
 
-      if (!isHiddenSystemContextContent(content)) {
+      const visibleContent = extractVisibleUserMessage(content);
+      if (visibleContent && (!isHiddenSystemContextContent(content) || visibleContent !== content)) {
         events.push(createConversationEvent({
           kind: CONVERSATION_EVENT_KINDS.USER_MESSAGE,
           provider,
           sessionId,
           timestamp,
-          payload: { text: content },
+          payload: { text: visibleContent },
           rawRef
         }));
       }