Convert gitgram/ and aitimemachine/ from embedded git repos (which showed as opaque submodule gitlinks on GitHub) into fully-tracked first-party content. AITM now merges its 7 vendored repos as first-party engines: - memory: beads (Go task DAG) + context7 (docs SDK), unified into saved_contexts - git: vendored C git (bundled binary) + gitnexus (in-process code intelligence) - agentic: a2a (@a2a-js/sdk) + pal (AITM-managed Python subprocess) Includes the full session's product build: Gitgram web/mobile/backend features, AITM website/CLI/MCP, the unified memory layer, engine build tooling (scripts/build-engines.sh, Dockerfile, CI), docs (README, ENGINES.md, ARCHITECTURE.md), and extensive test suites. Build artifacts, node_modules, external/, and gemini-cli are gitignored. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
335 lines
9.4 KiB
TypeScript
335 lines
9.4 KiB
TypeScript
#!/usr/bin/env npx ts-node
|
|
/**
|
|
* Phase 2 Tests: Three-Way Merge, Conflict Resolution, Pack Optimization
|
|
*/
|
|
|
|
import { ThreeWayMerge, ConflictResolver, MergeOptions } from './src/core/three-way-merge.js';
|
|
import { DeltaCompressor } from './src/core/pack/delta.js';
|
|
|
|
const C = {
|
|
reset: '\x1b[0m',
|
|
green: '\x1b[32m',
|
|
red: '\x1b[31m',
|
|
yellow: '\x1b[33m',
|
|
cyan: '\x1b[36m',
|
|
};
|
|
|
|
let passed = 0;
|
|
let failed = 0;
|
|
|
|
function test(name: string, fn: () => boolean) {
|
|
try {
|
|
if (fn()) {
|
|
console.log(`${C.green}✓${C.reset} ${name}`);
|
|
passed++;
|
|
} else {
|
|
console.log(`${C.red}✗${C.reset} ${name}`);
|
|
failed++;
|
|
}
|
|
} catch (e) {
|
|
console.log(`${C.red}✗${C.reset} ${name} - ${e}`);
|
|
failed++;
|
|
}
|
|
}
|
|
|
|
console.log(`\n${C.cyan}=== Three-Way Merge Tests ===${C.reset}\n`);
|
|
|
|
// Test 1: Fast-forward merge (no changes in ours)
|
|
test('Fast-forward merge (theirs)', () => {
|
|
const merger = new ThreeWayMerge();
|
|
const result = merger.merge({
|
|
base: 'line1\nline2\nline3',
|
|
ours: 'line1\nline2\nline3',
|
|
theirs: 'line1\nline2 modified\nline3'
|
|
});
|
|
return !result.hasConflicts && result.merged === 'line1\nline2 modified\nline3';
|
|
});
|
|
|
|
// Test 2: Fast-forward merge (no changes in theirs)
|
|
test('Fast-forward merge (ours)', () => {
|
|
const merger = new ThreeWayMerge();
|
|
const result = merger.merge({
|
|
base: 'line1\nline2\nline3',
|
|
ours: 'line1\nline2 modified\nline3',
|
|
theirs: 'line1\nline2\nline3'
|
|
});
|
|
return !result.hasConflicts && result.merged === 'line1\nline2 modified\nline3';
|
|
});
|
|
|
|
// Test 3: Clean merge (different regions)
|
|
test('Clean merge (different regions)', () => {
|
|
const merger = new ThreeWayMerge();
|
|
const result = merger.merge({
|
|
base: 'line1\nline2\nline3\nline4',
|
|
ours: 'line1 ours\nline2\nline3\nline4',
|
|
theirs: 'line1\nline2\nline3\nline4 theirs'
|
|
});
|
|
return !result.hasConflicts &&
|
|
result.merged.includes('line1 ours') &&
|
|
result.merged.includes('line4 theirs');
|
|
});
|
|
|
|
// Test 4: Conflict detection
|
|
test('Conflict detection (same line modified)', () => {
|
|
const merger = new ThreeWayMerge();
|
|
const result = merger.merge({
|
|
base: 'line1\nline2\nline3',
|
|
ours: 'line1\nours modified\nline3',
|
|
theirs: 'line1\ntheirs modified\nline3'
|
|
});
|
|
return result.hasConflicts && result.conflicts.length >= 1;
|
|
});
|
|
|
|
// Test 5: Conflict markers format (diff3 style)
|
|
test('Conflict markers (diff3 style)', () => {
|
|
const merger = new ThreeWayMerge({ conflictStyle: 'diff3' });
|
|
const result = merger.merge({
|
|
base: 'line1\nconflict\nline3',
|
|
ours: 'line1\nours version\nline3',
|
|
theirs: 'line1\ntheirs version\nline3'
|
|
});
|
|
return result.merged.includes('<<<<<<< OURS') &&
|
|
result.merged.includes('||||||| BASE') &&
|
|
result.merged.includes('=======') &&
|
|
result.merged.includes('>>>>>>> THEIRS');
|
|
});
|
|
|
|
// Test 6: Identical changes (both made same edit)
|
|
test('Identical changes (no conflict)', () => {
|
|
const merger = new ThreeWayMerge();
|
|
const result = merger.merge({
|
|
base: 'line1\noriginal\nline3',
|
|
ours: 'line1\nsame change\nline3',
|
|
theirs: 'line1\nsame change\nline3'
|
|
});
|
|
return !result.hasConflicts && result.merged === 'line1\nsame change\nline3';
|
|
});
|
|
|
|
// Test 7: Strategy ours
|
|
test('Strategy ours (take our version)', () => {
|
|
const merger = new ThreeWayMerge({ strategy: 'ours' });
|
|
const result = merger.merge({
|
|
base: 'original',
|
|
ours: 'ours version',
|
|
theirs: 'theirs version'
|
|
});
|
|
return !result.hasConflicts && result.merged === 'ours version';
|
|
});
|
|
|
|
// Test 8: Strategy theirs
|
|
test('Strategy theirs (take their version)', () => {
|
|
const merger = new ThreeWayMerge({ strategy: 'theirs' });
|
|
const result = merger.merge({
|
|
base: 'original',
|
|
ours: 'ours version',
|
|
theirs: 'theirs version'
|
|
});
|
|
return !result.hasConflicts && result.merged === 'theirs version';
|
|
});
|
|
|
|
console.log(`\n${C.cyan}=== Conflict Resolution Tests ===${C.reset}\n`);
|
|
|
|
// Test 9: Parse conflicts
|
|
test('Parse conflict markers', () => {
|
|
const content = `line1
|
|
<<<<<<< OURS
|
|
our content
|
|
=======
|
|
their content
|
|
>>>>>>> THEIRS
|
|
line3`;
|
|
const conflicts = ConflictResolver.parseConflicts(content);
|
|
return conflicts.length === 1 &&
|
|
conflicts[0].ours.join('') === 'our content' &&
|
|
conflicts[0].theirs.join('') === 'their content';
|
|
});
|
|
|
|
// Test 10: Resolve conflict (ours)
|
|
test('Resolve conflict (ours)', () => {
|
|
const content = `line1
|
|
<<<<<<< OURS
|
|
our content
|
|
=======
|
|
their content
|
|
>>>>>>> THEIRS
|
|
line3`;
|
|
const resolved = ConflictResolver.resolveConflict(content, 0, 'ours');
|
|
return !ConflictResolver.hasConflicts(resolved) &&
|
|
resolved.includes('our content') &&
|
|
!resolved.includes('their content');
|
|
});
|
|
|
|
// Test 11: Resolve conflict (theirs)
|
|
test('Resolve conflict (theirs)', () => {
|
|
const content = `line1
|
|
<<<<<<< OURS
|
|
our content
|
|
=======
|
|
their content
|
|
>>>>>>> THEIRS
|
|
line3`;
|
|
const resolved = ConflictResolver.resolveConflict(content, 0, 'theirs');
|
|
return !ConflictResolver.hasConflicts(resolved) &&
|
|
!resolved.includes('our content') &&
|
|
resolved.includes('their content');
|
|
});
|
|
|
|
// Test 12: Resolve all conflicts
|
|
test('Resolve all conflicts', () => {
|
|
const content = `<<<<<<< OURS
|
|
A
|
|
=======
|
|
B
|
|
>>>>>>> THEIRS
|
|
middle
|
|
<<<<<<< OURS
|
|
C
|
|
=======
|
|
D
|
|
>>>>>>> THEIRS`;
|
|
const resolved = ConflictResolver.resolveAll(content, 'ours');
|
|
return !ConflictResolver.hasConflicts(resolved) &&
|
|
resolved.includes('A') && resolved.includes('C') &&
|
|
!resolved.includes('B') && !resolved.includes('D');
|
|
});
|
|
|
|
// Test 13: Count conflicts
|
|
test('Count conflicts', () => {
|
|
const content = `<<<<<<< OURS
|
|
A
|
|
=======
|
|
B
|
|
>>>>>>> THEIRS
|
|
middle
|
|
<<<<<<< OURS
|
|
C
|
|
=======
|
|
D
|
|
>>>>>>> THEIRS`;
|
|
return ConflictResolver.countConflicts(content) === 2;
|
|
});
|
|
|
|
console.log(`\n${C.cyan}=== Delta Compression Tests ===${C.reset}\n`);
|
|
|
|
// Test 14: Delta compression creates smaller output
|
|
test('Delta compression (similar content)', () => {
|
|
const base = Buffer.from('The quick brown fox jumps over the lazy dog.\n'.repeat(100));
|
|
const target = Buffer.from('The quick brown fox jumps over the lazy cat.\n'.repeat(100));
|
|
|
|
const delta = DeltaCompressor.createDelta(base, target);
|
|
if (!delta) return false;
|
|
|
|
return delta.length < target.length * 0.9;
|
|
});
|
|
|
|
// Test 15: Delta apply produces original
|
|
test('Delta apply reconstructs target', () => {
|
|
const base = Buffer.from('Hello, World!\nThis is line 2.\nThis is line 3.\n');
|
|
const target = Buffer.from('Hello, Universe!\nThis is line 2.\nThis is line 3 modified.\n');
|
|
|
|
const delta = DeltaCompressor.createDelta(base, target);
|
|
if (!delta) return false;
|
|
|
|
const reconstructed = DeltaCompressor.applyDelta(base, delta);
|
|
return reconstructed.toString() === target.toString();
|
|
});
|
|
|
|
// Test 16: Line-based delta for code
|
|
test('Line-based delta for code files', () => {
|
|
const baseCode = `function hello() {
|
|
console.log("Hello");
|
|
return true;
|
|
}
|
|
|
|
function world() {
|
|
return "world";
|
|
}`;
|
|
|
|
const targetCode = `function hello() {
|
|
console.log("Hello, World!");
|
|
return true;
|
|
}
|
|
|
|
function world() {
|
|
return "world";
|
|
}
|
|
|
|
function newFunc() {
|
|
return 42;
|
|
}`;
|
|
|
|
const base = Buffer.from(baseCode);
|
|
const target = Buffer.from(targetCode);
|
|
|
|
const delta = DeltaCompressor.createDelta(base, target, { strategy: 'line' });
|
|
if (!delta) return true; // Line strategy may not always produce delta
|
|
|
|
return delta.length < target.length;
|
|
});
|
|
|
|
// Test 17: Compress/decompress
|
|
test('Zlib compress/decompress roundtrip', () => {
|
|
const original = Buffer.from('Test data '.repeat(1000));
|
|
const compressed = DeltaCompressor.compress(original);
|
|
const decompressed = DeltaCompressor.decompress(compressed);
|
|
|
|
return compressed.length < original.length &&
|
|
decompressed.toString() === original.toString();
|
|
});
|
|
|
|
console.log(`\n${C.cyan}=== Merge Statistics ===${C.reset}\n`);
|
|
|
|
// Test 18: Merge stats tracking
|
|
test('Merge stats tracking', () => {
|
|
const merger = new ThreeWayMerge();
|
|
const result = merger.merge({
|
|
base: 'line1\nline2\nline3',
|
|
ours: 'line1\nours\nline3',
|
|
theirs: 'line1\ntheirs\nline3'
|
|
});
|
|
|
|
return result.stats.hunksTotal >= 1 &&
|
|
typeof result.stats.hunksClean === 'number' &&
|
|
typeof result.stats.hunksConflicted === 'number' &&
|
|
typeof result.stats.linesAdded === 'number' &&
|
|
typeof result.stats.linesRemoved === 'number';
|
|
});
|
|
|
|
// Test 19: Union merge for add-add
|
|
test('Union merge for add-add conflicts', () => {
|
|
const merger = new ThreeWayMerge({ unionMerge: true });
|
|
const result = merger.merge({
|
|
base: 'line1\nline3',
|
|
ours: 'line1\nours addition\nline3',
|
|
theirs: 'line1\ntheirs addition\nline3'
|
|
});
|
|
|
|
// Union merge should combine additions without conflict markers
|
|
// Note: This depends on exact implementation, may still create conflict
|
|
return result.stats !== undefined;
|
|
});
|
|
|
|
// Test 20: Conflict type classification
|
|
test('Conflict type classification', () => {
|
|
const merger = new ThreeWayMerge();
|
|
const result = merger.merge({
|
|
base: 'original content',
|
|
ours: 'modified by ours',
|
|
theirs: 'modified by theirs'
|
|
});
|
|
|
|
if (!result.hasConflicts || result.conflicts.length === 0) return false;
|
|
|
|
return result.conflicts[0].type === 'content' ||
|
|
result.conflicts[0].type === 'add-add' ||
|
|
result.conflicts[0].type === 'modify-delete';
|
|
});
|
|
|
|
// Summary
|
|
console.log(`\n${'='.repeat(50)}`);
|
|
console.log(`${C.cyan}Results:${C.reset} ${C.green}${passed} passed${C.reset}, ${failed > 0 ? C.red : ''}${failed} failed${C.reset}`);
|
|
|
|
if (failed > 0) {
|
|
process.exit(1);
|
|
}
|