Skip to content

armgit / ruflo

Public Imported from GitHub
0

🌊 The original agent harness. Deploy intelligent multi-player swarms, coordinate autonomous workflows, and build conversational AI systems. Features adaptive memory, self-learning intelligence, federation, vector RAG integration, and native Claude Code / Codex / Hermes and many more Integrated

🔖 Task: There are merge conflicts. Please resolve them before committing your changes. ...

rUv0fedbac78010
diff --cc .claude-flow/metrics/performance.json
index 1af676d926,2ade227926..a9ac89c9e1
--- a/.claude-flow/metrics/performance.json
+++ b/.claude-flow/metrics/performance.json
@@@ -1,5 -1,5 +1,9 @@@
{
++<<<<<<< HEAD
+ "startTime": 1758233704862,
++=======
+ "startTime": 1758233448157,
++>>>>>>> 202ea1b7196fa42522bcbc91895745ead77c141b
"totalTasks": 1,
"successfulTasks": 1,
"failedTasks": 0,
diff --cc .claude-flow/metrics/system-metrics.json
index e041885f53,53445e4ef4..0ab1490efd
--- a/.claude-flow/metrics/system-metrics.json
+++ b/.claude-flow/metrics/system-metrics.json
@@@ -357,114 -1437,30 +1437,138 @@@
"cpuCount": 16,
"cpuLoad": 0.0575,
"platform": "linux",
- "uptime": 17070.6
+ "uptime": 17027.58
},
{
- "timestamp": 1758233459845,
+ "timestamp": 1758233416840,
"memoryTotal": 67427545088,
- "memoryUsed": 8327835648,
- "memoryFree": 59099709440,
- "memoryUsagePercent": 12.350791708538852,
- "memoryEfficiency": 87.64920829146115,
+ "memoryUsed": 8671608832,
+ "memoryFree": 58755936256,
+ "memoryUsagePercent": 12.860632580768947,
+ "memoryEfficiency": 87.13936741923105,
"cpuCount": 16,
- "cpuLoad": 0.07875,
+ "cpuLoad": 0.056875,
"platform": "linux",
- "uptime": 17100.62
+ "uptime": 17057.61
},
{
- "timestamp": 1758233489847,
+ "timestamp": 1758233446847,
"memoryTotal": 67427545088,
- "memoryUsed": 8096960512,
- "memoryFree": 59330584576,
- "memoryUsagePercent": 12.008386930641802,
- "memoryEfficiency": 87.9916130693582,
+ "memoryUsed": 8227266560,
+ "memoryFree": 59200278528,
+ "memoryUsagePercent": 12.201640367097092,
+ "memoryEfficiency": 87.7983596329029,
+ "cpuCount": 16,
+ "cpuLoad": 0.0725,
+ "platform": "linux",
+ "uptime": 17087.62
++ },
++ {
++ "timestamp": 1758233476877,
++ "memoryTotal": 67427545088,
++ "memoryUsed": 8227598336,
++ "memoryFree": 59199946752,
++ "memoryUsagePercent": 12.202132415264598,
++ "memoryEfficiency": 87.7978675847354,
++ "cpuCount": 16,
++ "cpuLoad": 0.075625,
++ "platform": "linux",
++ "uptime": 17117.65
++ },
++ {
++ "timestamp": 1758233506906,
++ "memoryTotal": 67427545088,
++ "memoryUsed": 8371609600,
++ "memoryFree": 59055935488,
++ "memoryUsagePercent": 12.415711693306013,
++ "memoryEfficiency": 87.58428830669399,
+ "cpuCount": 16,
+ "cpuLoad": 0.063125,
+ "platform": "linux",
- "uptime": 17130.62
++ "uptime": 17147.68
+ },
+ {
- "timestamp": 1758233519853,
++ "timestamp": 1758233536937,
+ "memoryTotal": 67427545088,
- "memoryUsed": 8295186432,
- "memoryFree": 59132358656,
- "memoryUsagePercent": 12.30237052405499,
- "memoryEfficiency": 87.697629475945,
++ "memoryUsed": 8170627072,
++ "memoryFree": 59256918016,
++ "memoryUsagePercent": 12.117639847834408,
++ "memoryEfficiency": 87.88236015216559,
+ "cpuCount": 16,
- "cpuLoad": 0.0775,
++ "cpuLoad": 0.088125,
+ "platform": "linux",
- "uptime": 17160.63
++ "uptime": 17177.71
+ },
+ {
- "timestamp": 1758233549866,
++ "timestamp": 1758233566967,
+ "memoryTotal": 67427545088,
- "memoryUsed": 8137826304,
- "memoryFree": 59289718784,
- "memoryUsagePercent": 12.068993900607364,
- "memoryEfficiency": 87.93100609939263,
++ "memoryUsed": 8349077504,
++ "memoryFree": 59078467584,
++ "memoryUsagePercent": 12.382294940596726,
++ "memoryEfficiency": 87.61770505940328,
+ "cpuCount": 16,
- "cpuLoad": 0.0825,
++ "cpuLoad": 0.078125,
+ "platform": "linux",
- "uptime": 17190.64
++ "uptime": 17207.74
+ },
+ {
- "timestamp": 1758233579887,
++ "timestamp": 1758233596997,
+ "memoryTotal": 67427545088,
- "memoryUsed": 8305344512,
- "memoryFree": 59122200576,
- "memoryUsagePercent": 12.317435702516912,
- "memoryEfficiency": 87.68256429748308,
++ "memoryUsed": 8281710592,
++ "memoryFree": 59145834496,
++ "memoryUsagePercent": 12.282384863918004,
++ "memoryEfficiency": 87.717615136082,
+ "cpuCount": 16,
- "cpuLoad": 0.0875,
++ "cpuLoad": 0.095,
+ "platform": "linux",
- "uptime": 17220.66
++ "uptime": 17237.77
+ },
+ {
- "timestamp": 1758233609917,
++ "timestamp": 1758233627026,
+ "memoryTotal": 67427545088,
- "memoryUsed": 8280334336,
- "memoryFree": 59147210752,
- "memoryUsagePercent": 12.280343775223164,
- "memoryEfficiency": 87.71965622477684,
++ "memoryUsed": 8386920448,
++ "memoryFree": 59040624640,
++ "memoryUsagePercent": 12.43841880503612,
++ "memoryEfficiency": 87.56158119496388,
+ "cpuCount": 16,
- "cpuLoad": 0.0975,
++ "cpuLoad": 0.103125,
+ "platform": "linux",
- "uptime": 17250.69
++ "uptime": 17267.8
+ },
+ {
- "timestamp": 1758233639941,
++ "timestamp": 1758233657057,
+ "memoryTotal": 67427545088,
- "memoryUsed": 8266518528,
- "memoryFree": 59161026560,
- "memoryUsagePercent": 12.259853917581202,
- "memoryEfficiency": 87.7401460824188,
++ "memoryUsed": 8019759104,
++ "memoryFree": 59407785984,
++ "memoryUsagePercent": 11.893891574331196,
++ "memoryEfficiency": 88.10610842566881,
+ "cpuCount": 16,
- "cpuLoad": 0.121875,
++ "cpuLoad": 0.094375,
+ "platform": "linux",
- "uptime": 17280.71
++ "uptime": 17297.83
+ },
+ {
- "timestamp": 1758233669971,
++ "timestamp": 1758233687087,
+ "memoryTotal": 67427545088,
- "memoryUsed": 8017489920,
- "memoryFree": 59410055168,
- "memoryUsagePercent": 11.890526207852202,
- "memoryEfficiency": 88.1094737921478,
++ "memoryUsed": 8070766592,
++ "memoryFree": 59356778496,
++ "memoryUsagePercent": 11.969539424083742,
++ "memoryEfficiency": 88.03046057591627,
+ "cpuCount": 16,
- "cpuLoad": 0.078125,
++ "cpuLoad": 0.060625,
+ "platform": "linux",
- "uptime": 17310.74
++ "uptime": 17327.86
+ },
+ {
- "timestamp": 1758233699984,
++ "timestamp": 1758233717096,
+ "memoryTotal": 67427545088,
- "memoryUsed": 8240820224,
- "memoryFree": 59186724864,
- "memoryUsagePercent": 12.221741445940035,
- "memoryEfficiency": 87.77825855405996,
++ "memoryUsed": 8135196672,
++ "memoryFree": 59292348416,
++ "memoryUsagePercent": 12.065093963279722,
++ "memoryEfficiency": 87.93490603672028,
+ "cpuCount": 16,
- "cpuLoad": 0.056875,
++ "cpuLoad": 0.053125,
+ "platform": "linux",
- "uptime": 17340.76
++ "uptime": 17357.87
}
]
diff --cc .claude-flow/metrics/task-metrics.json
index e9246c18cf,122ad47206..6cd6e8f652
--- a/.claude-flow/metrics/task-metrics.json
+++ b/.claude-flow/metrics/task-metrics.json
@@@ -1,10 -1,10 +1,18 @@@
[
{
++<<<<<<< HEAD
+ "id": "cmd-hooks-1758233704966",
+ "type": "hooks",
+ "success": true,
+ "duration": 13.800760000000025,
+ "timestamp": 1758233704980,
++=======
+ "id": "cmd-hooks-1758233448259",
+ "type": "hooks",
+ "success": true,
+ "duration": 6.968272000000013,
+ "timestamp": 1758233448266,
++>>>>>>> 202ea1b7196fa42522bcbc91895745ead77c141b
"metadata": {}
}
]