@axhub/genie 0.1.9 → 0.2.1

package/server/projects.js

@@ -52,6 +52,89 @@ import path from 'path';
 import readline from 'readline';
 import crypto from 'crypto';
 import { parseCodexTokenCountInfo } from './utils/codexTokenUsage.js';
+import { CODEX_MODELS } from '../shared/modelConstants.js';
+
+const KNOWN_CODEX_MODELS = new Set(
+  (CODEX_MODELS?.OPTIONS || []).map((option) => String(option?.value || '').trim().toLowerCase()).filter(Boolean)
+);
+
+function isRecognizedCodexModel(value) {
+  if (typeof value !== 'string') return false;
+  const normalized = value.trim().toLowerCase();
+  if (!normalized || normalized === 'custom' || normalized === 'default') {
+    return false;
+  }
+
+  if (KNOWN_CODEX_MODELS.has(normalized)) {
+    return true;
+  }
+
+  return /^(gpt-\d|o[1345](?:$|[-.])|codex(?:$|[-.]))/i.test(normalized);
+}
+
+function getCodexModelFromPayload(payload) {
+  if (!payload || typeof payload !== 'object') {
+    return null;
+  }
+
+  const candidates = [
+    payload.model,
+    payload.collaboration_mode?.model
+  ];
+
+  for (const candidate of candidates) {
+    if (isRecognizedCodexModel(candidate)) {
+      return candidate.trim();
+    }
+  }
+
+  return null;
+}
+
+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 isInjectedContextContent(value) {
+  const text = String(value || '').trim();
+  if (!text) {
+    return true;
+  }
+
+  if (
+    text.startsWith('# AGENTS.md instructions for ') ||
+    text.startsWith('[DYNAMIC CONTEXT V1]')
+  ) {
+    return true;
+  }
+
+  return /^<dynamic_context(?:\s|>)/i.test(text) || text.includes('<environment_context>');
+}
 
 // Import TaskMaster detection functions
 async function detectTaskMasterFolder(projectPath) {
@@ -1955,12 +2038,6 @@ async function parseCodexSessionFile(filePath) {
       crlfDelay: Infinity
     });
 
-    const isUsableCodexModel = (value) => {
-      if (typeof value !== 'string') return false;
-      const normalized = value.trim().toLowerCase();
-      return normalized.length > 0 && normalized !== 'custom' && normalized !== 'default';
-    };
-
     let sessionMeta = null;
     let lastTimestamp = null;
     let lastUserMessage = null;
@@ -1982,27 +2059,33 @@ async function parseCodexSessionFile(filePath) {
             sessionMeta = {
               id: entry.payload.id,
               cwd: entry.payload.cwd,
-              model: entry.payload.model || entry.payload.model_provider,
+              model: getCodexModelFromPayload(entry.payload),
               timestamp: entry.timestamp,
               git: entry.payload.git
             };
 
-            if (isUsableCodexModel(entry.payload.model)) {
-              lastResolvedModel = entry.payload.model;
-            } else if (isUsableCodexModel(entry.payload.model_provider)) {
-              lastResolvedModel = entry.payload.model_provider;
+            const sessionMetaModel = getCodexModelFromPayload(entry.payload);
+            if (sessionMetaModel) {
+              lastResolvedModel = sessionMetaModel;
             }
           }
 
-          if (entry.type === 'turn_context' && isUsableCodexModel(entry.payload?.model)) {
-            lastResolvedModel = entry.payload.model;
+          if (entry.type === 'turn_context') {
+            const turnContextModel = getCodexModelFromPayload(entry.payload);
+            if (turnContextModel) {
+              lastResolvedModel = turnContextModel;
+            }
           }
 
           // Count messages and extract user messages for summary
           if (entry.type === 'event_msg' && entry.payload?.type === 'user_message') {
+            const visibleUserMessage = extractVisibleUserMessage(entry.payload.message);
+            if (!visibleUserMessage) {
+              continue;
+            }
             messageCount++;
-            if (entry.payload.message) {
-              lastUserMessage = entry.payload.message;
+            if (visibleUserMessage) {
+              lastUserMessage = visibleUserMessage;
             }
           }
 
@@ -2107,20 +2190,22 @@ async function getCodexSessionMessages(sessionId, limit = null, offset = 0) {
             const content = entry.payload.content;
             const role = entry.payload.role || 'assistant';
             const textContent = extractText(content);
+            const visibleTextContent = role === 'user'
+              ? extractVisibleUserMessage(textContent)
+              : textContent;
 
-            // Skip system context messages (environment_context)
-            if (textContent?.includes('<environment_context>')) {
+            if (!visibleTextContent) {
               continue;
             }
 
             // Only add if there's actual content
-            if (textContent?.trim()) {
+            if (visibleTextContent?.trim()) {
               messages.push({
                 type: role === 'user' ? 'user' : 'assistant',
                 timestamp: entry.timestamp,
                 message: {
                   role: role,
-                  content: textContent
+                  content: visibleTextContent
                 }
               });
             }