codexmate 0.0.20 → 0.0.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.en.md +349 -259
- package/README.md +284 -252
- package/cli/agents-files.js +162 -0
- package/cli/archive-helpers.js +446 -0
- package/cli/auth-profiles.js +359 -0
- package/cli/builtin-proxy.js +580 -0
- package/cli/claude-proxy.js +998 -0
- package/cli/config-bootstrap.js +384 -0
- package/cli/config-health.js +338 -338
- package/cli/openclaw-config.js +629 -0
- package/cli/skills.js +1141 -0
- package/cli/zip-commands.js +510 -0
- package/cli.js +13101 -13497
- package/lib/cli-file-utils.js +151 -151
- package/lib/cli-models-utils.js +419 -311
- package/lib/cli-network-utils.js +164 -164
- package/lib/cli-path-utils.js +69 -0
- package/lib/cli-session-utils.js +121 -121
- package/lib/cli-sessions.js +386 -0
- package/lib/cli-utils.js +155 -155
- package/lib/download-artifacts.js +77 -0
- package/lib/mcp-stdio.js +440 -440
- package/lib/task-orchestrator.js +869 -0
- package/lib/text-diff.js +303 -303
- package/lib/workflow-engine.js +340 -340
- package/package.json +74 -70
- package/res/json5.min.js +1 -1
- package/res/vue.global.prod.js +13 -0
- package/web-ui/app.js +530 -397
- package/web-ui/index.html +33 -30
- package/web-ui/logic.agents-diff.mjs +386 -386
- package/web-ui/logic.claude.mjs +168 -108
- package/web-ui/logic.mjs +5 -5
- package/web-ui/logic.runtime.mjs +124 -124
- package/web-ui/logic.sessions.mjs +581 -263
- package/web-ui/modules/api.mjs +90 -69
- package/web-ui/modules/app.computed.dashboard.mjs +113 -113
- package/web-ui/modules/app.computed.index.mjs +15 -13
- package/web-ui/modules/app.computed.main-tabs.mjs +195 -0
- package/web-ui/modules/app.computed.session.mjs +507 -141
- package/web-ui/modules/app.constants.mjs +15 -15
- package/web-ui/modules/app.methods.agents.mjs +493 -493
- package/web-ui/modules/app.methods.claude-config.mjs +174 -174
- package/web-ui/modules/app.methods.codex-config.mjs +640 -640
- package/web-ui/modules/app.methods.index.mjs +88 -86
- package/web-ui/modules/app.methods.install.mjs +149 -157
- package/web-ui/modules/app.methods.navigation.mjs +619 -478
- package/web-ui/modules/app.methods.openclaw-core.mjs +814 -514
- package/web-ui/modules/app.methods.openclaw-editing.mjs +372 -337
- package/web-ui/modules/app.methods.openclaw-persist.mjs +369 -251
- package/web-ui/modules/app.methods.providers.mjs +363 -265
- package/web-ui/modules/app.methods.runtime.mjs +323 -323
- package/web-ui/modules/app.methods.session-actions.mjs +520 -457
- package/web-ui/modules/app.methods.session-browser.mjs +626 -435
- package/web-ui/modules/app.methods.session-timeline.mjs +448 -441
- package/web-ui/modules/app.methods.session-trash.mjs +422 -419
- package/web-ui/modules/app.methods.startup-claude.mjs +412 -406
- package/web-ui/modules/app.methods.task-orchestration.mjs +471 -0
- package/web-ui/modules/config-mode.computed.mjs +126 -124
- package/web-ui/modules/skills.computed.mjs +107 -107
- package/web-ui/modules/skills.methods.mjs +481 -481
- package/web-ui/partials/index/layout-footer.html +13 -69
- package/web-ui/partials/index/layout-header.html +402 -337
- package/web-ui/partials/index/modal-config-template-agents.html +125 -125
- package/web-ui/partials/index/modal-confirm-toast.html +32 -32
- package/web-ui/partials/index/modal-health-check.html +72 -72
- package/web-ui/partials/index/modal-openclaw-config.html +280 -275
- package/web-ui/partials/index/modal-skills.html +184 -184
- package/web-ui/partials/index/modals-basic.html +156 -196
- package/web-ui/partials/index/panel-config-claude.html +126 -100
- package/web-ui/partials/index/panel-config-codex.html +237 -237
- package/web-ui/partials/index/panel-config-openclaw.html +78 -84
- package/web-ui/partials/index/panel-docs.html +130 -0
- package/web-ui/partials/index/panel-market.html +174 -174
- package/web-ui/partials/index/panel-orchestration.html +397 -0
- package/web-ui/partials/index/panel-sessions.html +292 -387
- package/web-ui/partials/index/panel-settings.html +190 -166
- package/web-ui/partials/index/panel-usage.html +213 -0
- package/web-ui/session-helpers.mjs +559 -362
- package/web-ui/source-bundle.cjs +233 -233
- package/web-ui/styles/base-theme.css +271 -373
- package/web-ui/styles/controls-forms.css +360 -354
- package/web-ui/styles/docs-panel.css +182 -0
- package/web-ui/styles/feedback.css +108 -108
- package/web-ui/styles/health-check-dialog.css +144 -144
- package/web-ui/styles/layout-shell.css +376 -330
- package/web-ui/styles/modals-core.css +464 -449
- package/web-ui/styles/navigation-panels.css +348 -381
- package/web-ui/styles/openclaw-structured.css +266 -266
- package/web-ui/styles/responsive.css +450 -416
- package/web-ui/styles/sessions-list.css +400 -414
- package/web-ui/styles/sessions-preview.css +411 -405
- package/web-ui/styles/sessions-toolbar-trash.css +243 -243
- package/web-ui/styles/sessions-usage.css +628 -276
- package/web-ui/styles/skills-list.css +296 -298
- package/web-ui/styles/skills-market.css +335 -335
- package/web-ui/styles/task-orchestration.css +776 -0
- package/web-ui/styles/titles-cards.css +408 -407
- package/web-ui/styles.css +18 -16
- package/web-ui.html +17 -17
- package/res/screenshot.png +0 -0
- package/res/vue.global.js +0 -18552
package/lib/text-diff.js
CHANGED
|
@@ -1,303 +1,303 @@
|
|
|
1
|
-
const LARGE_DIFF_LINE_LIMIT = 3000;
|
|
2
|
-
const LARGE_DIFF_SYNC_LOOKAHEAD = 64;
|
|
3
|
-
|
|
4
|
-
function normalizeLineFeed(input) {
|
|
5
|
-
if (typeof input !== 'string') {
|
|
6
|
-
return '';
|
|
7
|
-
}
|
|
8
|
-
const withoutBom = input.charCodeAt(0) === 0xFEFF ? input.slice(1) : input;
|
|
9
|
-
return withoutBom.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
function splitLines(input) {
|
|
13
|
-
let normalized = normalizeLineFeed(input);
|
|
14
|
-
if (!normalized) return [];
|
|
15
|
-
if (normalized.endsWith('\n')) {
|
|
16
|
-
normalized = normalized.slice(0, -1);
|
|
17
|
-
}
|
|
18
|
-
if (!normalized) return [];
|
|
19
|
-
return normalized.split('\n');
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
function buildLcsMatrix(beforeLines, afterLines) {
|
|
23
|
-
const rows = beforeLines.length + 1;
|
|
24
|
-
const cols = afterLines.length + 1;
|
|
25
|
-
const matrix = Array.from({ length: rows }, () => new Array(cols).fill(0));
|
|
26
|
-
for (let i = 1; i < rows; i += 1) {
|
|
27
|
-
const beforeLine = beforeLines[i - 1];
|
|
28
|
-
for (let j = 1; j < cols; j += 1) {
|
|
29
|
-
if (beforeLine === afterLines[j - 1]) {
|
|
30
|
-
matrix[i][j] = matrix[i - 1][j - 1] + 1;
|
|
31
|
-
} else {
|
|
32
|
-
const up = matrix[i - 1][j];
|
|
33
|
-
const left = matrix[i][j - 1];
|
|
34
|
-
matrix[i][j] = up >= left ? up : left;
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
return matrix;
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
function countDiffStats(lines) {
|
|
42
|
-
let added = 0;
|
|
43
|
-
let removed = 0;
|
|
44
|
-
let unchanged = 0;
|
|
45
|
-
for (const line of lines) {
|
|
46
|
-
if (line.type === 'add') {
|
|
47
|
-
added += 1;
|
|
48
|
-
} else if (line.type === 'del') {
|
|
49
|
-
removed += 1;
|
|
50
|
-
} else {
|
|
51
|
-
unchanged += 1;
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
return { added, removed, unchanged };
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
function buildCollapsedContextLine(hiddenCount) {
|
|
58
|
-
return {
|
|
59
|
-
type: 'context',
|
|
60
|
-
value: `... ${hiddenCount} unchanged lines ...`,
|
|
61
|
-
oldNumber: null,
|
|
62
|
-
newNumber: null
|
|
63
|
-
};
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
function compactContextRuns(lines, contextSize = 3) {
|
|
67
|
-
const compacted = [];
|
|
68
|
-
const keepCount = Number.isFinite(contextSize) ? Math.max(1, Math.floor(contextSize)) : 3;
|
|
69
|
-
let index = 0;
|
|
70
|
-
while (index < lines.length) {
|
|
71
|
-
if (!lines[index] || lines[index].type !== 'context') {
|
|
72
|
-
compacted.push(lines[index]);
|
|
73
|
-
index += 1;
|
|
74
|
-
continue;
|
|
75
|
-
}
|
|
76
|
-
const start = index;
|
|
77
|
-
while (index < lines.length && lines[index] && lines[index].type === 'context') {
|
|
78
|
-
index += 1;
|
|
79
|
-
}
|
|
80
|
-
const run = lines.slice(start, index);
|
|
81
|
-
if (run.length <= keepCount * 2 + 1) {
|
|
82
|
-
compacted.push(...run);
|
|
83
|
-
continue;
|
|
84
|
-
}
|
|
85
|
-
compacted.push(...run.slice(0, keepCount));
|
|
86
|
-
compacted.push(buildCollapsedContextLine(run.length - keepCount * 2));
|
|
87
|
-
compacted.push(...run.slice(-keepCount));
|
|
88
|
-
}
|
|
89
|
-
return compacted;
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
function buildExactDiffLines(beforeLines, afterLines) {
|
|
93
|
-
const matrix = buildLcsMatrix(beforeLines, afterLines);
|
|
94
|
-
const lines = [];
|
|
95
|
-
let i = beforeLines.length;
|
|
96
|
-
let j = afterLines.length;
|
|
97
|
-
while (i > 0 || j > 0) {
|
|
98
|
-
if (i > 0 && j > 0 && beforeLines[i - 1] === afterLines[j - 1]) {
|
|
99
|
-
lines.push({
|
|
100
|
-
type: 'context',
|
|
101
|
-
value: beforeLines[i - 1],
|
|
102
|
-
oldNumber: i,
|
|
103
|
-
newNumber: j
|
|
104
|
-
});
|
|
105
|
-
i -= 1;
|
|
106
|
-
j -= 1;
|
|
107
|
-
continue;
|
|
108
|
-
}
|
|
109
|
-
const canAdd = j > 0;
|
|
110
|
-
const canDel = i > 0;
|
|
111
|
-
if (canAdd && (!canDel || matrix[i][j - 1] >= matrix[i - 1][j])) {
|
|
112
|
-
lines.push({
|
|
113
|
-
type: 'add',
|
|
114
|
-
value: afterLines[j - 1],
|
|
115
|
-
oldNumber: null,
|
|
116
|
-
newNumber: j
|
|
117
|
-
});
|
|
118
|
-
j -= 1;
|
|
119
|
-
continue;
|
|
120
|
-
}
|
|
121
|
-
if (canDel) {
|
|
122
|
-
lines.push({
|
|
123
|
-
type: 'del',
|
|
124
|
-
value: beforeLines[i - 1],
|
|
125
|
-
oldNumber: i,
|
|
126
|
-
newNumber: null
|
|
127
|
-
});
|
|
128
|
-
i -= 1;
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
lines.reverse();
|
|
132
|
-
return lines;
|
|
133
|
-
}
|
|
134
|
-
|
|
135
|
-
function findSyncPointInWindow(beforeLines, afterLines, beforeIndex, afterIndex, maxBeforeOffset, maxAfterOffset) {
|
|
136
|
-
if (maxBeforeOffset <= 0 && maxAfterOffset <= 0) {
|
|
137
|
-
return null;
|
|
138
|
-
}
|
|
139
|
-
|
|
140
|
-
for (let offset = 1; offset <= maxAfterOffset; offset += 1) {
|
|
141
|
-
if (beforeLines[beforeIndex] === afterLines[afterIndex + offset]) {
|
|
142
|
-
return { beforeIndex, afterIndex: afterIndex + offset };
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
for (let offset = 1; offset <= maxBeforeOffset; offset += 1) {
|
|
146
|
-
if (beforeLines[beforeIndex + offset] === afterLines[afterIndex]) {
|
|
147
|
-
return { beforeIndex: beforeIndex + offset, afterIndex };
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
|
|
151
|
-
const maxDistance = maxBeforeOffset + maxAfterOffset;
|
|
152
|
-
for (let distance = 2; distance <= maxDistance; distance += 1) {
|
|
153
|
-
const beforeStart = Math.max(1, distance - maxAfterOffset);
|
|
154
|
-
const beforeEnd = Math.min(maxBeforeOffset, distance - 1);
|
|
155
|
-
for (let beforeOffset = beforeStart; beforeOffset <= beforeEnd; beforeOffset += 1) {
|
|
156
|
-
const afterOffset = distance - beforeOffset;
|
|
157
|
-
if (beforeLines[beforeIndex + beforeOffset] === afterLines[afterIndex + afterOffset]) {
|
|
158
|
-
return {
|
|
159
|
-
beforeIndex: beforeIndex + beforeOffset,
|
|
160
|
-
afterIndex: afterIndex + afterOffset
|
|
161
|
-
};
|
|
162
|
-
}
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
|
-
return null;
|
|
166
|
-
}
|
|
167
|
-
|
|
168
|
-
function findNextSyncPoint(beforeLines, afterLines, beforeIndex, afterIndex, lookahead = LARGE_DIFF_SYNC_LOOKAHEAD) {
|
|
169
|
-
const remainingBefore = Math.max(0, beforeLines.length - beforeIndex - 1);
|
|
170
|
-
const remainingAfter = Math.max(0, afterLines.length - afterIndex - 1);
|
|
171
|
-
const maxWindow = Math.max(remainingBefore, remainingAfter);
|
|
172
|
-
if (maxWindow <= 0) {
|
|
173
|
-
return null;
|
|
174
|
-
}
|
|
175
|
-
|
|
176
|
-
const initialWindow = Number.isFinite(lookahead)
|
|
177
|
-
? Math.max(1, Math.floor(lookahead))
|
|
178
|
-
: LARGE_DIFF_SYNC_LOOKAHEAD;
|
|
179
|
-
let window = Math.min(maxWindow, initialWindow);
|
|
180
|
-
while (window > 0) {
|
|
181
|
-
const syncPoint = findSyncPointInWindow(
|
|
182
|
-
beforeLines,
|
|
183
|
-
afterLines,
|
|
184
|
-
beforeIndex,
|
|
185
|
-
afterIndex,
|
|
186
|
-
Math.min(window, remainingBefore),
|
|
187
|
-
Math.min(window, remainingAfter)
|
|
188
|
-
);
|
|
189
|
-
if (syncPoint) {
|
|
190
|
-
return syncPoint;
|
|
191
|
-
}
|
|
192
|
-
if (window >= maxWindow) {
|
|
193
|
-
return null;
|
|
194
|
-
}
|
|
195
|
-
window = Math.min(maxWindow, window * 2);
|
|
196
|
-
}
|
|
197
|
-
return null;
|
|
198
|
-
}
|
|
199
|
-
|
|
200
|
-
function buildLargeDiffLines(beforeLines, afterLines) {
|
|
201
|
-
const rawLines = [];
|
|
202
|
-
let beforeIndex = 0;
|
|
203
|
-
let afterIndex = 0;
|
|
204
|
-
|
|
205
|
-
while (beforeIndex < beforeLines.length && afterIndex < afterLines.length) {
|
|
206
|
-
if (beforeLines[beforeIndex] === afterLines[afterIndex]) {
|
|
207
|
-
rawLines.push({
|
|
208
|
-
type: 'context',
|
|
209
|
-
value: beforeLines[beforeIndex],
|
|
210
|
-
oldNumber: beforeIndex + 1,
|
|
211
|
-
newNumber: afterIndex + 1
|
|
212
|
-
});
|
|
213
|
-
beforeIndex += 1;
|
|
214
|
-
afterIndex += 1;
|
|
215
|
-
continue;
|
|
216
|
-
}
|
|
217
|
-
|
|
218
|
-
const syncPoint = findNextSyncPoint(beforeLines, afterLines, beforeIndex, afterIndex);
|
|
219
|
-
if (!syncPoint) {
|
|
220
|
-
rawLines.push({
|
|
221
|
-
type: 'del',
|
|
222
|
-
value: beforeLines[beforeIndex],
|
|
223
|
-
oldNumber: beforeIndex + 1,
|
|
224
|
-
newNumber: null
|
|
225
|
-
});
|
|
226
|
-
rawLines.push({
|
|
227
|
-
type: 'add',
|
|
228
|
-
value: afterLines[afterIndex],
|
|
229
|
-
oldNumber: null,
|
|
230
|
-
newNumber: afterIndex + 1
|
|
231
|
-
});
|
|
232
|
-
beforeIndex += 1;
|
|
233
|
-
afterIndex += 1;
|
|
234
|
-
continue;
|
|
235
|
-
}
|
|
236
|
-
|
|
237
|
-
while (beforeIndex < syncPoint.beforeIndex) {
|
|
238
|
-
rawLines.push({
|
|
239
|
-
type: 'del',
|
|
240
|
-
value: beforeLines[beforeIndex],
|
|
241
|
-
oldNumber: beforeIndex + 1,
|
|
242
|
-
newNumber: null
|
|
243
|
-
});
|
|
244
|
-
beforeIndex += 1;
|
|
245
|
-
}
|
|
246
|
-
while (afterIndex < syncPoint.afterIndex) {
|
|
247
|
-
rawLines.push({
|
|
248
|
-
type: 'add',
|
|
249
|
-
value: afterLines[afterIndex],
|
|
250
|
-
oldNumber: null,
|
|
251
|
-
newNumber: afterIndex + 1
|
|
252
|
-
});
|
|
253
|
-
afterIndex += 1;
|
|
254
|
-
}
|
|
255
|
-
}
|
|
256
|
-
|
|
257
|
-
while (beforeIndex < beforeLines.length) {
|
|
258
|
-
rawLines.push({
|
|
259
|
-
type: 'del',
|
|
260
|
-
value: beforeLines[beforeIndex],
|
|
261
|
-
oldNumber: beforeIndex + 1,
|
|
262
|
-
newNumber: null
|
|
263
|
-
});
|
|
264
|
-
beforeIndex += 1;
|
|
265
|
-
}
|
|
266
|
-
while (afterIndex < afterLines.length) {
|
|
267
|
-
rawLines.push({
|
|
268
|
-
type: 'add',
|
|
269
|
-
value: afterLines[afterIndex],
|
|
270
|
-
oldNumber: null,
|
|
271
|
-
newNumber: afterIndex + 1
|
|
272
|
-
});
|
|
273
|
-
afterIndex += 1;
|
|
274
|
-
}
|
|
275
|
-
|
|
276
|
-
return {
|
|
277
|
-
lines: compactContextRuns(rawLines),
|
|
278
|
-
stats: countDiffStats(rawLines)
|
|
279
|
-
};
|
|
280
|
-
}
|
|
281
|
-
|
|
282
|
-
function buildLineDiff(beforeText, afterText) {
|
|
283
|
-
const beforeLines = splitLines(beforeText);
|
|
284
|
-
const afterLines = splitLines(afterText);
|
|
285
|
-
const result = (beforeLines.length > LARGE_DIFF_LINE_LIMIT || afterLines.length > LARGE_DIFF_LINE_LIMIT)
|
|
286
|
-
? buildLargeDiffLines(beforeLines, afterLines)
|
|
287
|
-
: {
|
|
288
|
-
lines: buildExactDiffLines(beforeLines, afterLines),
|
|
289
|
-
stats: null
|
|
290
|
-
};
|
|
291
|
-
const stats = result.stats || countDiffStats(result.lines);
|
|
292
|
-
return {
|
|
293
|
-
lines: result.lines,
|
|
294
|
-
stats,
|
|
295
|
-
oldLineCount: beforeLines.length,
|
|
296
|
-
newLineCount: afterLines.length,
|
|
297
|
-
truncated: false
|
|
298
|
-
};
|
|
299
|
-
}
|
|
300
|
-
|
|
301
|
-
module.exports = {
|
|
302
|
-
buildLineDiff
|
|
303
|
-
};
|
|
1
|
+
const LARGE_DIFF_LINE_LIMIT = 3000;
|
|
2
|
+
const LARGE_DIFF_SYNC_LOOKAHEAD = 64;
|
|
3
|
+
|
|
4
|
+
function normalizeLineFeed(input) {
|
|
5
|
+
if (typeof input !== 'string') {
|
|
6
|
+
return '';
|
|
7
|
+
}
|
|
8
|
+
const withoutBom = input.charCodeAt(0) === 0xFEFF ? input.slice(1) : input;
|
|
9
|
+
return withoutBom.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
function splitLines(input) {
|
|
13
|
+
let normalized = normalizeLineFeed(input);
|
|
14
|
+
if (!normalized) return [];
|
|
15
|
+
if (normalized.endsWith('\n')) {
|
|
16
|
+
normalized = normalized.slice(0, -1);
|
|
17
|
+
}
|
|
18
|
+
if (!normalized) return [];
|
|
19
|
+
return normalized.split('\n');
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
function buildLcsMatrix(beforeLines, afterLines) {
|
|
23
|
+
const rows = beforeLines.length + 1;
|
|
24
|
+
const cols = afterLines.length + 1;
|
|
25
|
+
const matrix = Array.from({ length: rows }, () => new Array(cols).fill(0));
|
|
26
|
+
for (let i = 1; i < rows; i += 1) {
|
|
27
|
+
const beforeLine = beforeLines[i - 1];
|
|
28
|
+
for (let j = 1; j < cols; j += 1) {
|
|
29
|
+
if (beforeLine === afterLines[j - 1]) {
|
|
30
|
+
matrix[i][j] = matrix[i - 1][j - 1] + 1;
|
|
31
|
+
} else {
|
|
32
|
+
const up = matrix[i - 1][j];
|
|
33
|
+
const left = matrix[i][j - 1];
|
|
34
|
+
matrix[i][j] = up >= left ? up : left;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
return matrix;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
function countDiffStats(lines) {
|
|
42
|
+
let added = 0;
|
|
43
|
+
let removed = 0;
|
|
44
|
+
let unchanged = 0;
|
|
45
|
+
for (const line of lines) {
|
|
46
|
+
if (line.type === 'add') {
|
|
47
|
+
added += 1;
|
|
48
|
+
} else if (line.type === 'del') {
|
|
49
|
+
removed += 1;
|
|
50
|
+
} else {
|
|
51
|
+
unchanged += 1;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return { added, removed, unchanged };
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
function buildCollapsedContextLine(hiddenCount) {
|
|
58
|
+
return {
|
|
59
|
+
type: 'context',
|
|
60
|
+
value: `... ${hiddenCount} unchanged lines ...`,
|
|
61
|
+
oldNumber: null,
|
|
62
|
+
newNumber: null
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
function compactContextRuns(lines, contextSize = 3) {
|
|
67
|
+
const compacted = [];
|
|
68
|
+
const keepCount = Number.isFinite(contextSize) ? Math.max(1, Math.floor(contextSize)) : 3;
|
|
69
|
+
let index = 0;
|
|
70
|
+
while (index < lines.length) {
|
|
71
|
+
if (!lines[index] || lines[index].type !== 'context') {
|
|
72
|
+
compacted.push(lines[index]);
|
|
73
|
+
index += 1;
|
|
74
|
+
continue;
|
|
75
|
+
}
|
|
76
|
+
const start = index;
|
|
77
|
+
while (index < lines.length && lines[index] && lines[index].type === 'context') {
|
|
78
|
+
index += 1;
|
|
79
|
+
}
|
|
80
|
+
const run = lines.slice(start, index);
|
|
81
|
+
if (run.length <= keepCount * 2 + 1) {
|
|
82
|
+
compacted.push(...run);
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
compacted.push(...run.slice(0, keepCount));
|
|
86
|
+
compacted.push(buildCollapsedContextLine(run.length - keepCount * 2));
|
|
87
|
+
compacted.push(...run.slice(-keepCount));
|
|
88
|
+
}
|
|
89
|
+
return compacted;
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
function buildExactDiffLines(beforeLines, afterLines) {
|
|
93
|
+
const matrix = buildLcsMatrix(beforeLines, afterLines);
|
|
94
|
+
const lines = [];
|
|
95
|
+
let i = beforeLines.length;
|
|
96
|
+
let j = afterLines.length;
|
|
97
|
+
while (i > 0 || j > 0) {
|
|
98
|
+
if (i > 0 && j > 0 && beforeLines[i - 1] === afterLines[j - 1]) {
|
|
99
|
+
lines.push({
|
|
100
|
+
type: 'context',
|
|
101
|
+
value: beforeLines[i - 1],
|
|
102
|
+
oldNumber: i,
|
|
103
|
+
newNumber: j
|
|
104
|
+
});
|
|
105
|
+
i -= 1;
|
|
106
|
+
j -= 1;
|
|
107
|
+
continue;
|
|
108
|
+
}
|
|
109
|
+
const canAdd = j > 0;
|
|
110
|
+
const canDel = i > 0;
|
|
111
|
+
if (canAdd && (!canDel || matrix[i][j - 1] >= matrix[i - 1][j])) {
|
|
112
|
+
lines.push({
|
|
113
|
+
type: 'add',
|
|
114
|
+
value: afterLines[j - 1],
|
|
115
|
+
oldNumber: null,
|
|
116
|
+
newNumber: j
|
|
117
|
+
});
|
|
118
|
+
j -= 1;
|
|
119
|
+
continue;
|
|
120
|
+
}
|
|
121
|
+
if (canDel) {
|
|
122
|
+
lines.push({
|
|
123
|
+
type: 'del',
|
|
124
|
+
value: beforeLines[i - 1],
|
|
125
|
+
oldNumber: i,
|
|
126
|
+
newNumber: null
|
|
127
|
+
});
|
|
128
|
+
i -= 1;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
lines.reverse();
|
|
132
|
+
return lines;
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
function findSyncPointInWindow(beforeLines, afterLines, beforeIndex, afterIndex, maxBeforeOffset, maxAfterOffset) {
|
|
136
|
+
if (maxBeforeOffset <= 0 && maxAfterOffset <= 0) {
|
|
137
|
+
return null;
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
for (let offset = 1; offset <= maxAfterOffset; offset += 1) {
|
|
141
|
+
if (beforeLines[beforeIndex] === afterLines[afterIndex + offset]) {
|
|
142
|
+
return { beforeIndex, afterIndex: afterIndex + offset };
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
for (let offset = 1; offset <= maxBeforeOffset; offset += 1) {
|
|
146
|
+
if (beforeLines[beforeIndex + offset] === afterLines[afterIndex]) {
|
|
147
|
+
return { beforeIndex: beforeIndex + offset, afterIndex };
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
const maxDistance = maxBeforeOffset + maxAfterOffset;
|
|
152
|
+
for (let distance = 2; distance <= maxDistance; distance += 1) {
|
|
153
|
+
const beforeStart = Math.max(1, distance - maxAfterOffset);
|
|
154
|
+
const beforeEnd = Math.min(maxBeforeOffset, distance - 1);
|
|
155
|
+
for (let beforeOffset = beforeStart; beforeOffset <= beforeEnd; beforeOffset += 1) {
|
|
156
|
+
const afterOffset = distance - beforeOffset;
|
|
157
|
+
if (beforeLines[beforeIndex + beforeOffset] === afterLines[afterIndex + afterOffset]) {
|
|
158
|
+
return {
|
|
159
|
+
beforeIndex: beforeIndex + beforeOffset,
|
|
160
|
+
afterIndex: afterIndex + afterOffset
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
return null;
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
function findNextSyncPoint(beforeLines, afterLines, beforeIndex, afterIndex, lookahead = LARGE_DIFF_SYNC_LOOKAHEAD) {
|
|
169
|
+
const remainingBefore = Math.max(0, beforeLines.length - beforeIndex - 1);
|
|
170
|
+
const remainingAfter = Math.max(0, afterLines.length - afterIndex - 1);
|
|
171
|
+
const maxWindow = Math.max(remainingBefore, remainingAfter);
|
|
172
|
+
if (maxWindow <= 0) {
|
|
173
|
+
return null;
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
const initialWindow = Number.isFinite(lookahead)
|
|
177
|
+
? Math.max(1, Math.floor(lookahead))
|
|
178
|
+
: LARGE_DIFF_SYNC_LOOKAHEAD;
|
|
179
|
+
let window = Math.min(maxWindow, initialWindow);
|
|
180
|
+
while (window > 0) {
|
|
181
|
+
const syncPoint = findSyncPointInWindow(
|
|
182
|
+
beforeLines,
|
|
183
|
+
afterLines,
|
|
184
|
+
beforeIndex,
|
|
185
|
+
afterIndex,
|
|
186
|
+
Math.min(window, remainingBefore),
|
|
187
|
+
Math.min(window, remainingAfter)
|
|
188
|
+
);
|
|
189
|
+
if (syncPoint) {
|
|
190
|
+
return syncPoint;
|
|
191
|
+
}
|
|
192
|
+
if (window >= maxWindow) {
|
|
193
|
+
return null;
|
|
194
|
+
}
|
|
195
|
+
window = Math.min(maxWindow, window * 2);
|
|
196
|
+
}
|
|
197
|
+
return null;
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
function buildLargeDiffLines(beforeLines, afterLines) {
|
|
201
|
+
const rawLines = [];
|
|
202
|
+
let beforeIndex = 0;
|
|
203
|
+
let afterIndex = 0;
|
|
204
|
+
|
|
205
|
+
while (beforeIndex < beforeLines.length && afterIndex < afterLines.length) {
|
|
206
|
+
if (beforeLines[beforeIndex] === afterLines[afterIndex]) {
|
|
207
|
+
rawLines.push({
|
|
208
|
+
type: 'context',
|
|
209
|
+
value: beforeLines[beforeIndex],
|
|
210
|
+
oldNumber: beforeIndex + 1,
|
|
211
|
+
newNumber: afterIndex + 1
|
|
212
|
+
});
|
|
213
|
+
beforeIndex += 1;
|
|
214
|
+
afterIndex += 1;
|
|
215
|
+
continue;
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
const syncPoint = findNextSyncPoint(beforeLines, afterLines, beforeIndex, afterIndex);
|
|
219
|
+
if (!syncPoint) {
|
|
220
|
+
rawLines.push({
|
|
221
|
+
type: 'del',
|
|
222
|
+
value: beforeLines[beforeIndex],
|
|
223
|
+
oldNumber: beforeIndex + 1,
|
|
224
|
+
newNumber: null
|
|
225
|
+
});
|
|
226
|
+
rawLines.push({
|
|
227
|
+
type: 'add',
|
|
228
|
+
value: afterLines[afterIndex],
|
|
229
|
+
oldNumber: null,
|
|
230
|
+
newNumber: afterIndex + 1
|
|
231
|
+
});
|
|
232
|
+
beforeIndex += 1;
|
|
233
|
+
afterIndex += 1;
|
|
234
|
+
continue;
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
while (beforeIndex < syncPoint.beforeIndex) {
|
|
238
|
+
rawLines.push({
|
|
239
|
+
type: 'del',
|
|
240
|
+
value: beforeLines[beforeIndex],
|
|
241
|
+
oldNumber: beforeIndex + 1,
|
|
242
|
+
newNumber: null
|
|
243
|
+
});
|
|
244
|
+
beforeIndex += 1;
|
|
245
|
+
}
|
|
246
|
+
while (afterIndex < syncPoint.afterIndex) {
|
|
247
|
+
rawLines.push({
|
|
248
|
+
type: 'add',
|
|
249
|
+
value: afterLines[afterIndex],
|
|
250
|
+
oldNumber: null,
|
|
251
|
+
newNumber: afterIndex + 1
|
|
252
|
+
});
|
|
253
|
+
afterIndex += 1;
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
|
|
257
|
+
while (beforeIndex < beforeLines.length) {
|
|
258
|
+
rawLines.push({
|
|
259
|
+
type: 'del',
|
|
260
|
+
value: beforeLines[beforeIndex],
|
|
261
|
+
oldNumber: beforeIndex + 1,
|
|
262
|
+
newNumber: null
|
|
263
|
+
});
|
|
264
|
+
beforeIndex += 1;
|
|
265
|
+
}
|
|
266
|
+
while (afterIndex < afterLines.length) {
|
|
267
|
+
rawLines.push({
|
|
268
|
+
type: 'add',
|
|
269
|
+
value: afterLines[afterIndex],
|
|
270
|
+
oldNumber: null,
|
|
271
|
+
newNumber: afterIndex + 1
|
|
272
|
+
});
|
|
273
|
+
afterIndex += 1;
|
|
274
|
+
}
|
|
275
|
+
|
|
276
|
+
return {
|
|
277
|
+
lines: compactContextRuns(rawLines),
|
|
278
|
+
stats: countDiffStats(rawLines)
|
|
279
|
+
};
|
|
280
|
+
}
|
|
281
|
+
|
|
282
|
+
function buildLineDiff(beforeText, afterText) {
|
|
283
|
+
const beforeLines = splitLines(beforeText);
|
|
284
|
+
const afterLines = splitLines(afterText);
|
|
285
|
+
const result = (beforeLines.length > LARGE_DIFF_LINE_LIMIT || afterLines.length > LARGE_DIFF_LINE_LIMIT)
|
|
286
|
+
? buildLargeDiffLines(beforeLines, afterLines)
|
|
287
|
+
: {
|
|
288
|
+
lines: buildExactDiffLines(beforeLines, afterLines),
|
|
289
|
+
stats: null
|
|
290
|
+
};
|
|
291
|
+
const stats = result.stats || countDiffStats(result.lines);
|
|
292
|
+
return {
|
|
293
|
+
lines: result.lines,
|
|
294
|
+
stats,
|
|
295
|
+
oldLineCount: beforeLines.length,
|
|
296
|
+
newLineCount: afterLines.length,
|
|
297
|
+
truncated: false
|
|
298
|
+
};
|
|
299
|
+
}
|
|
300
|
+
|
|
301
|
+
module.exports = {
|
|
302
|
+
buildLineDiff
|
|
303
|
+
};
|