Repository navigation
Commit 5e04ce2
committed
Merge step-2 baseline and refresh memory-core gate for the CLI fork
Merge origin/sync/upstream-step2, including baseline commit 4401d46.
Resolve the baseline-only conflict by regenerating with:
python3 scripts/lint-memory-core.py --write-baseline
The CLI operation, activation, configuration and daemon code predates the
upstream memory-core gate and was absent from its MCP baseline. Record the
fork's existing raw-allocator sites, remove deleted MCP files, and tighten
counts for upstream memory-core migrations. This records inherited debt;
it does not claim that raw allocations were migrated or permit future growth.
Complete the final operation-layer source checks: root-owner ambiguity names
all competing projects using upstream's memory-core list builder, and source
search uses upstream's nullable comparison helper for stable tie ordering.
The existing native daemon root-owner regression asserts both names.
No Co-Authored-By trailer. No full test suites run, as requested.3 files changed
Lines changed: 77 additions & 17 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
20 | | - | |
21 | | - | |
| 19 | + | |
22 | 20 | | |
23 | 21 | | |
24 | 22 | | |
25 | | - | |
| 23 | + | |
26 | 24 | | |
27 | | - | |
| 25 | + | |
| 26 | + | |
28 | 27 | | |
29 | | - | |
| 28 | + | |
30 | 29 | | |
31 | 30 | | |
32 | | - | |
33 | 31 | | |
| 32 | + | |
34 | 33 | | |
35 | 34 | | |
36 | 35 | | |
| |||
39 | 38 | | |
40 | 39 | | |
41 | 40 | | |
| 41 | + | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
50 | 50 | | |
51 | 51 | | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
56 | 79 | | |
57 | 80 | | |
58 | 81 | | |
| |||
84 | 107 | | |
85 | 108 | | |
86 | 109 | | |
87 | | - | |
| 110 | + | |
88 | 111 | | |
89 | 112 | | |
90 | 113 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1017 | 1017 | | |
1018 | 1018 | | |
1019 | 1019 | | |
| 1020 | + | |
| 1021 | + | |
| 1022 | + | |
| 1023 | + | |
| 1024 | + | |
| 1025 | + | |
| 1026 | + | |
| 1027 | + | |
| 1028 | + | |
| 1029 | + | |
| 1030 | + | |
| 1031 | + | |
| 1032 | + | |
| 1033 | + | |
1020 | 1034 | | |
1021 | 1035 | | |
1022 | 1036 | | |
| 1037 | + | |
| 1038 | + | |
1023 | 1039 | | |
1024 | 1040 | | |
1025 | 1041 | | |
| |||
1037 | 1053 | | |
1038 | 1054 | | |
1039 | 1055 | | |
| 1056 | + | |
1040 | 1057 | | |
1041 | 1058 | | |
1042 | 1059 | | |
| |||
1050 | 1067 | | |
1051 | 1068 | | |
1052 | 1069 | | |
| 1070 | + | |
1053 | 1071 | | |
1054 | 1072 | | |
1055 | 1073 | | |
1056 | 1074 | | |
| 1075 | + | |
| 1076 | + | |
| 1077 | + | |
| 1078 | + | |
| 1079 | + | |
| 1080 | + | |
| 1081 | + | |
| 1082 | + | |
| 1083 | + | |
1057 | 1084 | | |
1058 | 1085 | | |
1059 | 1086 | | |
1060 | 1087 | | |
1061 | 1088 | | |
1062 | 1089 | | |
1063 | 1090 | | |
| 1091 | + | |
1064 | 1092 | | |
1065 | 1093 | | |
1066 | 1094 | | |
| |||
1075 | 1103 | | |
1076 | 1104 | | |
1077 | 1105 | | |
| 1106 | + | |
1078 | 1107 | | |
1079 | 1108 | | |
1080 | 1109 | | |
1081 | 1110 | | |
1082 | 1111 | | |
1083 | 1112 | | |
1084 | | - | |
| 1113 | + | |
| 1114 | + | |
1085 | 1115 | | |
1086 | 1116 | | |
| 1117 | + | |
1087 | 1118 | | |
1088 | 1119 | | |
1089 | 1120 | | |
1090 | 1121 | | |
| 1122 | + | |
1091 | 1123 | | |
1092 | 1124 | | |
| 1125 | + | |
1093 | 1126 | | |
1094 | 1127 | | |
1095 | 1128 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
253 | 253 | | |
254 | 254 | | |
255 | 255 | | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
256 | 260 | | |
257 | 261 | | |
258 | 262 | | |
| |||
262 | 266 | | |
263 | 267 | | |
264 | 268 | | |
265 | | - | |
| 269 | + | |
266 | 270 | | |
267 | 271 | | |
268 | 272 | | |
269 | | - | |
| 273 | + | |
270 | 274 | | |
271 | 275 | | |
272 | 276 | | |
| |||
0 commit comments