@adhdev/daemon-core 0.8.24 → 0.8.27

package/src/status/normalize.ts

@@ -64,6 +64,23 @@ function trimMessageForStatus(message: unknown, stringLimit: number): unknown {
     return trimStructuredStrings(message, stringLimit);
 }
 
+/**
+ * Collapse timestamp / createdAt into receivedAt so downstream consumers
+ * only ever need to read a single canonical time field.
+ */
+function normalizeMessageTime(message: unknown): unknown {
+    if (!message || typeof message !== 'object') return message;
+    const msg = message as Record<string, unknown>;
+    if (msg.receivedAt == null) {
+        const fallback = msg.timestamp ?? msg.createdAt;
+        if (fallback != null) {
+            const ts = typeof fallback === 'string' ? Date.parse(fallback as string) : Number(fallback);
+            if (Number.isFinite(ts) && ts > 0) msg.receivedAt = ts;
+        }
+    }
+    return msg;
+}
+
 function trimMessagesForStatus(messages: unknown[] | null | undefined): unknown[] {
     if (!Array.isArray(messages) || messages.length === 0) return [];
 
@@ -72,11 +89,11 @@ function trimMessagesForStatus(messages: unknown[] | null | undefined): unknown[
     let totalBytes = 0;
 
     for (let i = recent.length - 1; i >= 0; i -= 1) {
-        let normalized = trimMessageForStatus(recent[i], STATUS_ACTIVE_CHAT_STRING_LIMIT);
+        let normalized = normalizeMessageTime(trimMessageForStatus(recent[i], STATUS_ACTIVE_CHAT_STRING_LIMIT));
         let size = estimateBytes(normalized);
 
         if (size > STATUS_ACTIVE_CHAT_TOTAL_BYTES_LIMIT) {
-            normalized = trimMessageForStatus(recent[i], STATUS_ACTIVE_CHAT_FALLBACK_STRING_LIMIT);
+            normalized = normalizeMessageTime(trimMessageForStatus(recent[i], STATUS_ACTIVE_CHAT_FALLBACK_STRING_LIMIT));
             size = estimateBytes(normalized);
         }
 

package/src/status/snapshot.ts

@@ -95,17 +95,12 @@ function parseMessageTime(value: unknown): number {
 
 function getSessionMessageUpdatedAt(session: {
     activeChat?: {
-        messages?: Array<{ timestamp?: number | string; receivedAt?: number | string; createdAt?: number | string }> | null
+        messages?: Array<{ receivedAt?: number | string }> | null
     } | null
 }) {
     const lastMessage = session.activeChat?.messages?.at?.(-1);
     if (!lastMessage) return 0;
-    return (
-        parseMessageTime(lastMessage.timestamp)
-        || parseMessageTime(lastMessage.receivedAt)
-        || parseMessageTime(lastMessage.createdAt)
-        || 0
-    );
+    return parseMessageTime(lastMessage.receivedAt) || 0;
 }
 
 export function getSessionCompletionMarker(session: {
@@ -114,9 +109,7 @@ export function getSessionCompletionMarker(session: {
             role?: string;
             id?: string;
             index?: number;
-            timestamp?: number | string;
             receivedAt?: number | string;
-            createdAt?: number | string;
             _turnKey?: string;
         }> | null
     } | null
@@ -124,17 +117,17 @@ export function getSessionCompletionMarker(session: {
     const lastMessage = session.activeChat?.messages?.at?.(-1) as any;
     if (!lastMessage) return '';
     const role = typeof lastMessage.role === 'string' ? lastMessage.role : '';
-    if (role === 'user' || role === 'human') return '';
+    if (role === 'user' || role === 'human' || role === 'system') return '';
     if (typeof lastMessage._turnKey === 'string' && lastMessage._turnKey) return `turn:${lastMessage._turnKey}`;
     if (typeof lastMessage.id === 'string' && lastMessage.id) return `id:${lastMessage.id}`;
     if (typeof lastMessage.index === 'number' && Number.isFinite(lastMessage.index)) return `idx:${lastMessage.index}`;
-    const timestamp = parseMessageTime(lastMessage.timestamp) || parseMessageTime(lastMessage.receivedAt) || parseMessageTime(lastMessage.createdAt);
+    const timestamp = parseMessageTime(lastMessage.receivedAt);
     return timestamp > 0 ? `ts:${timestamp}` : '';
 }
 
 function getSessionLastUsedAt(session: {
     activeChat?: {
-        messages?: Array<{ timestamp?: number | string; receivedAt?: number | string; createdAt?: number | string }> | null
+        messages?: Array<{ receivedAt?: number | string }> | null
     } | null
     lastUpdated?: number
 }) {
@@ -171,7 +164,7 @@ function getUnreadState(
     }
     const unread = completionMarker
         ? completionMarker !== seenCompletionMarker
-        : hasContentChange && lastUsedAt > lastSeenAt && lastRole !== 'user' && lastRole !== 'human';
+        : hasContentChange && lastUsedAt > lastSeenAt && lastRole !== 'user' && lastRole !== 'human' && lastRole !== 'system';
     return { unread, inboxBucket: unread ? 'task_complete' : 'idle' };
 }