@skillsmith/mcp-server 0.3.6 → 0.3.8

package/dist/src/tools/install.conflict.test.js

@@ -1,354 +0,0 @@
-/**
- * @fileoverview Unit Tests for Conflict Detection and Resolution
- * @module @skillsmith/mcp-server/tools/install.conflict.test
- * @see SMI-1868, SMI-1879
- *
- * Tests cover:
- * - checkForConflicts: Detect local modifications before update
- * - handleMergeAction: Three-way merge with conflict resolution
- *
- * Related test files:
- * - install.conflict-helpers.test.ts: hashContent, detectModifications, backups
- * - merge.test.ts: computeDiff, threeWayMerge
- */
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import * as fs from 'fs/promises';
-// Import functions under test
-import { hashContent } from './install.conflict-helpers.js';
-import { checkForConflicts, handleMergeAction } from './install.conflict.js';
-// Mock fs module
-vi.mock('fs/promises');
-const mockedFs = vi.mocked(fs);
-// Import the mocked helpers for configuration in tests
-import * as helpersModule from './install.helpers.js';
-// Mock install.helpers for updateManifestSafely
-vi.mock('./install.helpers.js', async (importOriginal) => {
-    const actual = await importOriginal();
-    return {
-        ...actual,
-        detectModifications: vi.fn(),
-        createSkillBackup: vi.fn().mockResolvedValue('/backup/path'),
-        storeOriginal: vi.fn().mockResolvedValue(undefined),
-        loadOriginal: vi.fn(),
-        cleanupOldBackups: vi.fn().mockResolvedValue(undefined),
-        updateManifestSafely: vi.fn().mockResolvedValue(undefined),
-    };
-});
-const mockedHelpers = vi.mocked(helpersModule);
-// ============================================================================
-// Tests for checkForConflicts
-// ============================================================================
-describe('checkForConflicts', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-    it('should proceed when skill has no originalContentHash', async () => {
-        const manifest = {
-            version: '1.0.0',
-            installedSkills: {
-                'test-skill': {
-                    id: 'owner/test-skill',
-                    name: 'test-skill',
-                    version: '1.0.0',
-                    source: 'github:owner/test-skill',
-                    installPath: '/path/to/skill',
-                    installedAt: '2025-01-01',
-                    lastUpdated: '2025-01-01',
-                    // No originalContentHash
-                },
-            },
-        };
-        const result = await checkForConflicts('test-skill', '/path/to/skill', manifest, undefined, 'owner/test-skill');
-        expect(result.shouldProceed).toBe(true);
-    });
-    it('should proceed when skill is not modified', async () => {
-        const content = 'Original content';
-        const originalHash = hashContent(content);
-        const manifest = {
-            version: '1.0.0',
-            installedSkills: {
-                'test-skill': {
-                    id: 'owner/test-skill',
-                    name: 'test-skill',
-                    version: '1.0.0',
-                    source: 'github:owner/test-skill',
-                    installPath: '/path/to/skill',
-                    installedAt: '2025-01-01',
-                    lastUpdated: '2025-01-01',
-                    originalContentHash: originalHash,
-                },
-            },
-        };
-        // Configure mock to return no modification
-        mockedHelpers.detectModifications.mockResolvedValue({
-            modified: false,
-            currentHash: originalHash,
-            originalHash: originalHash,
-        });
-        const result = await checkForConflicts('test-skill', '/path/to/skill', manifest, undefined, 'owner/test-skill');
-        expect(result.shouldProceed).toBe(true);
-    });
-    it('should return conflict info when modified and no action specified', async () => {
-        const originalContent = 'Original content';
-        const modifiedContent = 'Modified content';
-        const originalHash = hashContent(originalContent);
-        const modifiedHash = hashContent(modifiedContent);
-        const manifest = {
-            version: '1.0.0',
-            installedSkills: {
-                'test-skill': {
-                    id: 'owner/test-skill',
-                    name: 'test-skill',
-                    version: '1.0.0',
-                    source: 'github:owner/test-skill',
-                    installPath: '/path/to/skill',
-                    installedAt: '2025-01-01',
-                    lastUpdated: '2025-01-01',
-                    originalContentHash: originalHash,
-                },
-            },
-        };
-        // Configure mock to return modified
-        mockedHelpers.detectModifications.mockResolvedValue({
-            modified: true,
-            currentHash: modifiedHash,
-            originalHash: originalHash,
-        });
-        const result = await checkForConflicts('test-skill', '/path/to/skill', manifest, undefined, 'owner/test-skill');
-        expect(result.shouldProceed).toBe(false);
-        expect(result.earlyReturn).toBeDefined();
-        expect(result.earlyReturn.conflict).toBeDefined();
-        expect(result.earlyReturn.conflict.hasLocalModifications).toBe(true);
-        expect(result.earlyReturn.requiresAction).toContain('overwrite');
-        expect(result.earlyReturn.requiresAction).toContain('merge');
-        expect(result.earlyReturn.requiresAction).toContain('cancel');
-    });
-    it('should cancel when action is cancel', async () => {
-        const originalContent = 'Original content';
-        const modifiedContent = 'Modified content';
-        const originalHash = hashContent(originalContent);
-        const modifiedHash = hashContent(modifiedContent);
-        const manifest = {
-            version: '1.0.0',
-            installedSkills: {
-                'test-skill': {
-                    id: 'owner/test-skill',
-                    name: 'test-skill',
-                    version: '1.0.0',
-                    source: 'github:owner/test-skill',
-                    installPath: '/path/to/skill',
-                    installedAt: '2025-01-01',
-                    lastUpdated: '2025-01-01',
-                    originalContentHash: originalHash,
-                },
-            },
-        };
-        // Configure mock to return modified
-        mockedHelpers.detectModifications.mockResolvedValue({
-            modified: true,
-            currentHash: modifiedHash,
-            originalHash: originalHash,
-        });
-        const result = await checkForConflicts('test-skill', '/path/to/skill', manifest, 'cancel', 'owner/test-skill');
-        expect(result.shouldProceed).toBe(false);
-        expect(result.earlyReturn).toBeDefined();
-        expect(result.earlyReturn.error).toContain('cancelled');
-    });
-    it('should create backup when action is overwrite', async () => {
-        const originalContent = 'Original content';
-        const modifiedContent = 'Modified content';
-        const originalHash = hashContent(originalContent);
-        const modifiedHash = hashContent(modifiedContent);
-        const manifest = {
-            version: '1.0.0',
-            installedSkills: {
-                'test-skill': {
-                    id: 'owner/test-skill',
-                    name: 'test-skill',
-                    version: '1.0.0',
-                    source: 'github:owner/test-skill',
-                    installPath: '/path/to/skill',
-                    installedAt: '2025-01-01',
-                    lastUpdated: '2025-01-01',
-                    originalContentHash: originalHash,
-                },
-            },
-        };
-        // Configure mocks
-        mockedHelpers.detectModifications.mockResolvedValue({
-            modified: true,
-            currentHash: modifiedHash,
-            originalHash: originalHash,
-        });
-        mockedHelpers.createSkillBackup.mockResolvedValue('/backup/path/test-skill');
-        const result = await checkForConflicts('test-skill', '/path/to/skill', manifest, 'overwrite', 'owner/test-skill');
-        expect(result.shouldProceed).toBe(true);
-        expect(result.backupPath).toBeDefined();
-    });
-    it('should proceed for merge action', async () => {
-        const originalContent = 'Original content';
-        const modifiedContent = 'Modified content';
-        const originalHash = hashContent(originalContent);
-        const modifiedHash = hashContent(modifiedContent);
-        const manifest = {
-            version: '1.0.0',
-            installedSkills: {
-                'test-skill': {
-                    id: 'owner/test-skill',
-                    name: 'test-skill',
-                    version: '1.0.0',
-                    source: 'github:owner/test-skill',
-                    installPath: '/path/to/skill',
-                    installedAt: '2025-01-01',
-                    lastUpdated: '2025-01-01',
-                    originalContentHash: originalHash,
-                },
-            },
-        };
-        // Configure mock to return modified
-        mockedHelpers.detectModifications.mockResolvedValue({
-            modified: true,
-            currentHash: modifiedHash,
-            originalHash: originalHash,
-        });
-        const result = await checkForConflicts('test-skill', '/path/to/skill', manifest, 'merge', 'owner/test-skill');
-        expect(result.shouldProceed).toBe(true);
-    });
-});
-// ============================================================================
-// Tests for handleMergeAction
-// ============================================================================
-describe('handleMergeAction', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-    it('should fallback to overwrite when no original content found', async () => {
-        const manifest = {
-            version: '1.0.0',
-            installedSkills: {
-                'test-skill': {
-                    id: 'owner/test-skill',
-                    name: 'test-skill',
-                    version: '1.0.0',
-                    source: 'github:owner/test-skill',
-                    installPath: '/path/to/skill',
-                    installedAt: '2025-01-01',
-                    lastUpdated: '2025-01-01',
-                },
-            },
-        };
-        // loadOriginal returns null
-        mockedHelpers.loadOriginal.mockResolvedValue(null);
-        mockedFs.readFile.mockResolvedValue('Current content'); // current content
-        const result = await handleMergeAction('test-skill', '/path/to/skill', 'Upstream content', manifest, 'owner', 'repo', 'owner/test-skill');
-        expect(result.shouldProceed).toBe(true);
-    });
-    it('should return merged content on clean merge', async () => {
-        const originalContent = `Line 1
-Line 2
-Line 3`;
-        const currentContent = `Line 1
-Local Line 2
-Line 3`;
-        const upstreamContent = `Line 1
-Line 2
-Upstream Line 3`;
-        const manifest = {
-            version: '1.0.0',
-            installedSkills: {
-                'test-skill': {
-                    id: 'owner/test-skill',
-                    name: 'test-skill',
-                    version: '1.0.0',
-                    source: 'github:owner/test-skill',
-                    installPath: '/path/to/skill',
-                    installedAt: '2025-01-01',
-                    lastUpdated: '2025-01-01',
-                },
-            },
-        };
-        // loadOriginal returns original content
-        mockedHelpers.loadOriginal.mockResolvedValue(originalContent);
-        // current content read from fs
-        mockedFs.readFile.mockResolvedValue(currentContent);
-        const result = await handleMergeAction('test-skill', '/path/to/skill', upstreamContent, manifest, 'owner', 'repo', 'owner/test-skill');
-        expect(result.shouldProceed).toBe(true);
-        expect(result.mergedContent).toBeDefined();
-        expect(result.mergedContent).toContain('Local Line 2');
-        expect(result.mergedContent).toContain('Upstream Line 3');
-    });
-    it('should handle deleted local file as a conflict', async () => {
-        const originalContent = 'Original content';
-        const upstreamContent = 'Upstream content';
-        const manifest = {
-            version: '1.0.0',
-            installedSkills: {
-                'test-skill': {
-                    id: 'owner/test-skill',
-                    name: 'test-skill',
-                    version: '1.0.0',
-                    source: 'github:owner/test-skill',
-                    installPath: '/path/to/skill',
-                    installedAt: '2025-01-01',
-                    lastUpdated: '2025-01-01',
-                },
-            },
-        };
-        // loadOriginal returns original content
-        mockedHelpers.loadOriginal.mockResolvedValue(originalContent);
-        // current content - file deleted (throws ENOENT, treated as empty)
-        const error = new Error('ENOENT');
-        error.code = 'ENOENT';
-        mockedFs.readFile.mockRejectedValue(error);
-        // createSkillBackup mock
-        mockedHelpers.createSkillBackup.mockResolvedValue('/backup/path/test-skill');
-        // fs operations for writing conflict file
-        mockedFs.mkdir.mockResolvedValue(undefined);
-        mockedFs.writeFile.mockResolvedValue(undefined);
-        const result = await handleMergeAction('test-skill', '/path/to/skill', upstreamContent, manifest, 'owner', 'repo', 'owner/test-skill');
-        // When local is deleted (empty) and upstream differs from original,
-        // this is a conflict since both sides modified the content differently
-        expect(result.shouldProceed).toBe(false);
-        expect(result.backupPath).toBeDefined();
-        expect(result.earlyReturn).toBeDefined();
-        expect(result.earlyReturn.mergeResult).toBeDefined();
-        expect(result.earlyReturn.mergeResult.conflicts).toBeDefined();
-    });
-    it('should create backup and write conflict markers on merge conflict', async () => {
-        const originalContent = 'Original content';
-        const currentContent = 'Local version';
-        const upstreamContent = 'Upstream version';
-        const manifest = {
-            version: '1.0.0',
-            installedSkills: {
-                'test-skill': {
-                    id: 'owner/test-skill',
-                    name: 'test-skill',
-                    version: '1.0.0',
-                    source: 'github:owner/test-skill',
-                    installPath: '/path/to/skill',
-                    installedAt: '2025-01-01',
-                    lastUpdated: '2025-01-01',
-                },
-            },
-        };
-        // loadOriginal returns original content
-        mockedHelpers.loadOriginal.mockResolvedValue(originalContent);
-        // current content read from fs
-        mockedFs.readFile.mockResolvedValue(currentContent);
-        // createSkillBackup mock
-        mockedHelpers.createSkillBackup.mockResolvedValue('/backup/path/test-skill');
-        // fs operations for writing conflict file
-        mockedFs.mkdir.mockResolvedValue(undefined);
-        mockedFs.writeFile.mockResolvedValue(undefined);
-        const result = await handleMergeAction('test-skill', '/path/to/skill', upstreamContent, manifest, 'owner', 'repo', 'owner/test-skill');
-        expect(result.shouldProceed).toBe(false);
-        expect(result.backupPath).toBeDefined();
-        expect(result.earlyReturn).toBeDefined();
-        expect(result.earlyReturn.mergeResult).toBeDefined();
-        expect(result.earlyReturn.mergeResult.conflicts.length).toBeGreaterThan(0);
-        expect(result.earlyReturn.tips).toBeDefined();
-        expect(result.earlyReturn.tips).toContainEqual(expect.stringContaining('conflict'));
-    });
-});
-//# sourceMappingURL=install.conflict.test.js.map

package/dist/src/tools/install.conflict.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"install.conflict.test.js","sourceRoot":"","sources":["../../../src/tools/install.conflict.test.ts"],"names":[],"mappings":"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"}

package/dist/src/tools/merge.test.d.ts

@@ -1,11 +0,0 @@
-/**
- * @fileoverview Unit Tests for Three-Way Merge Algorithm
- * @module @skillsmith/mcp-server/tools/merge.test
- * @see SMI-1868, SMI-1879
- *
- * Tests cover:
- * - computeDiff: Line-by-line diff detection
- * - threeWayMerge: Three-way merge with conflict detection
- */
-export {};
-//# sourceMappingURL=merge.test.d.ts.map

package/dist/src/tools/merge.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge.test.d.ts","sourceRoot":"","sources":["../../../src/tools/merge.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG"}

package/dist/src/tools/merge.test.js

@@ -1,224 +0,0 @@
-/**
- * @fileoverview Unit Tests for Three-Way Merge Algorithm
- * @module @skillsmith/mcp-server/tools/merge.test
- * @see SMI-1868, SMI-1879
- *
- * Tests cover:
- * - computeDiff: Line-by-line diff detection
- * - threeWayMerge: Three-way merge with conflict detection
- */
-import { describe, it, expect } from 'vitest';
-// Import functions under test
-import { threeWayMerge, computeDiff } from './merge.js';
-// ============================================================================
-// Tests for computeDiff
-// ============================================================================
-describe('computeDiff', () => {
-    it('should detect no changes for identical content', () => {
-        const content = `Line 1
-Line 2
-Line 3`;
-        const result = computeDiff(content, content);
-        expect(result.additions).toHaveLength(0);
-        expect(result.deletions).toHaveLength(0);
-        expect(result.unchanged).toEqual([1, 2, 3]);
-    });
-    it('should detect added lines', () => {
-        const base = `Line 1
-Line 2`;
-        const target = `Line 1
-Line 2
-Line 3`;
-        const result = computeDiff(base, target);
-        expect(result.additions).toContain(3);
-        expect(result.deletions).toHaveLength(0);
-        expect(result.unchanged).toEqual([1, 2]);
-    });
-    it('should detect deleted lines', () => {
-        const base = `Line 1
-Line 2
-Line 3`;
-        const target = `Line 1
-Line 3`;
-        const result = computeDiff(base, target);
-        expect(result.deletions).toContain(2);
-        expect(result.unchanged).toEqual([1, 3]);
-    });
-    it('should detect modified lines', () => {
-        const base = `Line 1
-Line 2
-Line 3`;
-        const target = `Line 1
-Modified Line 2
-Line 3`;
-        const result = computeDiff(base, target);
-        expect(result.deletions).toContain(2);
-        expect(result.additions).toContain(2);
-    });
-    it('should handle empty base', () => {
-        const base = '';
-        const target = 'New line';
-        const result = computeDiff(base, target);
-        // Empty string splits to [''], so there's 1 line that gets "deleted"
-        // and 1 line that gets "added"
-        expect(result.additions).toContain(1);
-        // An empty string still has one "line" (empty line) that counts as a deletion
-        expect(result.deletions).toHaveLength(1);
-    });
-    it('should handle empty target', () => {
-        const base = 'Old line';
-        const target = '';
-        const result = computeDiff(base, target);
-        expect(result.deletions).toContain(1);
-        // An empty string still has one "line" (empty line) that counts as an addition
-        expect(result.additions).toHaveLength(1);
-    });
-});
-// ============================================================================
-// Tests for threeWayMerge
-// ============================================================================
-describe('threeWayMerge', () => {
-    describe('edge cases', () => {
-        it('should handle all empty content', () => {
-            const result = threeWayMerge('', '', '');
-            expect(result.success).toBe(true);
-            expect(result.merged).toBe('');
-        });
-        it('should use upstream when local is empty and base is empty', () => {
-            const upstream = 'New content';
-            const result = threeWayMerge('', '', upstream);
-            expect(result.success).toBe(true);
-            expect(result.merged).toBe(upstream);
-        });
-        it('should use local when upstream is empty and base is empty', () => {
-            const local = 'Local content';
-            const result = threeWayMerge('', local, '');
-            expect(result.success).toBe(true);
-            expect(result.merged).toBe(local);
-        });
-        it('should conflict when both have content but no base', () => {
-            const local = 'Local content';
-            const upstream = 'Upstream content';
-            const result = threeWayMerge('', local, upstream);
-            expect(result.success).toBe(false);
-            expect(result.conflicts).toHaveLength(1);
-            expect(result.merged).toContain('<<<<<<< LOCAL');
-            expect(result.merged).toContain('>>>>>>> UPSTREAM');
-        });
-    });
-    describe('unchanged scenarios', () => {
-        it('should use upstream when local is unchanged', () => {
-            const base = 'Original content';
-            const local = 'Original content';
-            const upstream = 'Updated content';
-            const result = threeWayMerge(base, local, upstream);
-            expect(result.success).toBe(true);
-            expect(result.merged).toBe(upstream);
-        });
-        it('should use local when upstream is unchanged', () => {
-            const base = 'Original content';
-            const local = 'Modified content';
-            const upstream = 'Original content';
-            const result = threeWayMerge(base, local, upstream);
-            expect(result.success).toBe(true);
-            expect(result.merged).toBe(local);
-        });
-        it('should use either when both have same changes', () => {
-            const base = 'Original content';
-            const local = 'Same modified content';
-            const upstream = 'Same modified content';
-            const result = threeWayMerge(base, local, upstream);
-            expect(result.success).toBe(true);
-            expect(result.merged).toBe(local);
-        });
-    });
-    describe('clean merges', () => {
-        it('should merge non-overlapping changes', () => {
-            const base = `Line 1
-Line 2
-Line 3`;
-            const local = `Line 1
-Modified Line 2
-Line 3`;
-            const upstream = `Line 1
-Line 2
-Modified Line 3`;
-            const result = threeWayMerge(base, local, upstream);
-            expect(result.success).toBe(true);
-            expect(result.merged).toContain('Modified Line 2');
-            expect(result.merged).toContain('Modified Line 3');
-        });
-        it('should handle local additions at end', () => {
-            const base = `Line 1
-Line 2`;
-            const local = `Line 1
-Line 2
-New local line`;
-            const upstream = `Modified Line 1
-Line 2`;
-            const result = threeWayMerge(base, local, upstream);
-            expect(result.success).toBe(true);
-            expect(result.merged).toContain('Modified Line 1');
-            expect(result.merged).toContain('New local line');
-        });
-        it('should handle upstream additions at end', () => {
-            const base = `Line 1
-Line 2`;
-            const local = `Modified Line 1
-Line 2`;
-            const upstream = `Line 1
-Line 2
-New upstream line`;
-            const result = threeWayMerge(base, local, upstream);
-            expect(result.success).toBe(true);
-            expect(result.merged).toContain('Modified Line 1');
-            expect(result.merged).toContain('New upstream line');
-        });
-    });
-    describe('conflicts', () => {
-        it('should detect conflict when both modify same line', () => {
-            const base = `Line 1
-Line 2
-Line 3`;
-            const local = `Line 1
-Local change
-Line 3`;
-            const upstream = `Line 1
-Upstream change
-Line 3`;
-            const result = threeWayMerge(base, local, upstream);
-            expect(result.success).toBe(false);
-            expect(result.conflicts).toBeDefined();
-            expect(result.conflicts.length).toBeGreaterThan(0);
-            expect(result.merged).toContain('<<<<<<< LOCAL');
-            expect(result.merged).toContain('=======');
-            expect(result.merged).toContain('>>>>>>> UPSTREAM');
-        });
-        it('should include conflict markers in merged output', () => {
-            const base = 'Original';
-            const local = 'Local version';
-            const upstream = 'Upstream version';
-            const result = threeWayMerge(base, local, upstream);
-            expect(result.success).toBe(false);
-            expect(result.merged).toContain('<<<<<<< LOCAL');
-            expect(result.merged).toContain('Local version');
-            expect(result.merged).toContain('=======');
-            expect(result.merged).toContain('Upstream version');
-            expect(result.merged).toContain('>>>>>>> UPSTREAM');
-        });
-        it('should provide conflict details', () => {
-            const base = 'Original';
-            const local = 'Local version';
-            const upstream = 'Upstream version';
-            const result = threeWayMerge(base, local, upstream);
-            expect(result.conflicts).toBeDefined();
-            expect(result.conflicts[0]).toMatchObject({
-                lineNumber: expect.any(Number),
-                local: expect.stringContaining('Local'),
-                upstream: expect.stringContaining('Upstream'),
-                base: expect.any(String),
-            });
-        });
-    });
-});
-//# sourceMappingURL=merge.test.js.map

package/dist/src/tools/merge.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge.test.js","sourceRoot":"","sources":["../../../src/tools/merge.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/integration/install-conflict.integration.test.d.ts

@@ -1,8 +0,0 @@
-/**
- * SMI-1869: Conflict Resolution Flow Integration Tests
- * Tests for conflict detection and resolution during skill reinstallation
- *
- * Split from install.integration.test.ts per governance standards (SMI-1880)
- */
-export {};
-//# sourceMappingURL=install-conflict.integration.test.d.ts.map

package/dist/tests/integration/install-conflict.integration.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"install-conflict.integration.test.d.ts","sourceRoot":"","sources":["../../../tests/integration/install-conflict.integration.test.ts"],"names":[],"mappings":"AAAA;;;;;GAKG"}