fix(ci): stabilize memory migration ordering and matrix checks

Preserve deterministic append/input order for timestamp-tied memory entries to avoid flaky migration assertions, and replace rg with portable grep in Apple matrix validation so CI runners without ripgrep pass.

Made-with: Cursor

Author: MarcoDotIO

Scripts/validate-apple-matrix.sh

@@ -11,7 +11,7 @@ fi
 
 required_platform_tokens=(".iOS(" ".macOS(" ".tvOS(" ".watchOS(")
 for token in "${required_platform_tokens[@]}"; do
-  if ! rg -q --fixed-strings "${token}" "Package.swift"; then
+  if ! grep -Fq "${token}" "Package.swift"; then
     echo "Missing platform declaration token '${token}' in Package.swift"
     exit 1
   fi
@@ -31,8 +31,8 @@ for path in "${required_share_extension_files[@]}"; do
 done
 
 # Ensure iOS 26-only APIs stay availability-gated.
-if rg -q "BGContinuedProcessingTask|BGContinuedProcessingTaskRequest" "Examples/iOS/OpenClawiOS/OpenClawiOS"; then
-  if ! rg -q "@available\\(iOS 26\\.0, \\*\\)" "Examples/iOS/OpenClawiOS/OpenClawiOS"; then
+if grep -ERq "BGContinuedProcessingTask|BGContinuedProcessingTaskRequest" "Examples/iOS/OpenClawiOS/OpenClawiOS"; then
+  if ! grep -ERq "@available\\(iOS 26\\.0, \\*\\)" "Examples/iOS/OpenClawiOS/OpenClawiOS"; then
     echo "Detected iOS 26 APIs without availability guard."
     exit 1
   fi

Sources/OpenClawMemory/ConversationMemoryStore.swift

@@ -181,14 +181,28 @@ public actor ConversationMemoryStore: ConversationMemoryStoreProtocol {
 
     /// Returns all entries across sessions sorted by timestamp.
     public func allEntries() -> [ConversationMemoryEntry] {
-        self.entriesBySession.values
-            .flatMap { $0 }
-            .sorted { lhs, rhs in
-                if lhs.createdAtMs == rhs.createdAtMs {
-                    return lhs.id < rhs.id
+        let flattened: [(entry: ConversationMemoryEntry, sessionKey: String, index: Int)] = self.entriesBySession
+            .flatMap { sessionKey, entries in
+                entries.enumerated().map { offset, entry in
+                    (entry, sessionKey, offset)
                 }
-                return lhs.createdAtMs < rhs.createdAtMs
             }
+        let ordered = flattened.sorted { lhs, rhs in
+            if lhs.entry.createdAtMs != rhs.entry.createdAtMs {
+                return lhs.entry.createdAtMs < rhs.entry.createdAtMs
+            }
+            if lhs.sessionKey == rhs.sessionKey {
+                return lhs.index < rhs.index
+            }
+            if lhs.sessionKey != rhs.sessionKey {
+                return lhs.sessionKey < rhs.sessionKey
+            }
+            if lhs.index != rhs.index {
+                return lhs.index < rhs.index
+            }
+            return lhs.entry.id < rhs.entry.id
+        }
+        return ordered.map(\.entry)
     }
 
     private func append(_ entry: ConversationMemoryEntry) {

Sources/OpenClawMemory/SwiftDataMemoryGraphStore.swift

@@ -162,14 +162,28 @@ public actor SwiftDataMemoryGraphStore: ConversationMemoryStoreProtocol {
 
     /// Returns all memory graph entries in chronological order.
     public func allEntries() -> [ConversationMemoryEntry] {
-        self.entriesBySession.values
-            .flatMap { $0 }
-            .sorted { lhs, rhs in
-                if lhs.createdAtMs == rhs.createdAtMs {
-                    return lhs.id < rhs.id
+        let flattened: [(entry: ConversationMemoryEntry, sessionKey: String, index: Int)] = self.entriesBySession
+            .flatMap { sessionKey, entries in
+                entries.enumerated().map { offset, entry in
+                    (entry, sessionKey, offset)
                 }
-                return lhs.createdAtMs < rhs.createdAtMs
             }
+        let ordered = flattened.sorted { lhs, rhs in
+            if lhs.entry.createdAtMs != rhs.entry.createdAtMs {
+                return lhs.entry.createdAtMs < rhs.entry.createdAtMs
+            }
+            if lhs.sessionKey == rhs.sessionKey {
+                return lhs.index < rhs.index
+            }
+            if lhs.sessionKey != rhs.sessionKey {
+                return lhs.sessionKey < rhs.sessionKey
+            }
+            if lhs.index != rhs.index {
+                return lhs.index < rhs.index
+            }
+            return lhs.entry.id < rhs.entry.id
+        }
+        return ordered.map(\.entry)
     }
 
     /// Imports pre-existing memory entries, preserving IDs/timestamps.
@@ -193,12 +207,13 @@ public actor SwiftDataMemoryGraphStore: ConversationMemoryStoreProtocol {
 
     private func appendEntries(_ entries: [ConversationMemoryEntry]) {
         guard !entries.isEmpty else { return }
-        let sorted = entries.sorted { lhs, rhs in
-            if lhs.createdAtMs == rhs.createdAtMs {
-                return lhs.id < rhs.id
+        let sorted = entries.enumerated().sorted { lhs, rhs in
+            if lhs.element.createdAtMs != rhs.element.createdAtMs {
+                return lhs.element.createdAtMs < rhs.element.createdAtMs
             }
-            return lhs.createdAtMs < rhs.createdAtMs
-        }
+            // Keep original caller order when timestamps collide.
+            return lhs.offset < rhs.offset
+        }.map(\.element)
         var existingIDs = Set(self.allEntries().map(\.id))
         for entry in sorted {
             guard !existingIDs.contains(entry.id) else {