feat: introduce skills management functionality with IPC methods for listing, installing, and managing skills, including support for legacy migrations and conflict resolution

Author: Cyneric

src/main/__tests__/preload-bridge.test.ts

@@ -32,6 +32,18 @@ const EXPECTED_KEYS = [
   'rulesSyncAll',
   'rulesDetectWorkspaces',
   'rulesImportFromProject',
+  'skillsListInstalled',
+  'skillsListCurated',
+  'skillsDetectWorkspaces',
+  'skillsPrepareInstall',
+  'skillsInstallCurated',
+  'skillsCreate',
+  'skillsDelete',
+  'skillsSetEnabled',
+  'skillsMigrateLegacyPreview',
+  'skillsMigrateLegacyApply',
+  'skillsSyncListConflicts',
+  'skillsSyncResolveConflict',
   'profilesList',
   'profilesGet',
   'profilesCreate',
@@ -51,6 +63,7 @@ const EXPECTED_KEYS = [
   'gitSyncStatus',
   'gitSyncConnectGitHub',
   'gitSyncConnectManual',
+  'gitSyncTestRemote',
   'gitSyncDisconnect',
   'gitSyncPush',
   'gitSyncPull',
@@ -136,6 +149,10 @@ describe('preload bridge composition', () => {
     await api.clientsClearManualConfigPath('cursor')
     await api.serversList()
     await api.rulesSyncAll()
+    await api.gitSyncTestRemote({
+      remoteUrl: 'ssh://git@github.com/owner/repo.git',
+      authMethod: 'ssh',
+    })
     await api.settingsSet('language', 'en')
     await api.backupsList('cursor')
     await api.filesReveal('C:\\tmp\\file.txt')
@@ -168,6 +185,10 @@ describe('preload bridge composition', () => {
     expect(invoke).toHaveBeenCalledWith('clients:clear-manual-config-path', 'cursor')
     expect(invoke).toHaveBeenCalledWith('servers:list')
     expect(invoke).toHaveBeenCalledWith('rules:sync-all')
+    expect(invoke).toHaveBeenCalledWith('git-sync:test-remote', {
+      remoteUrl: 'ssh://git@github.com/owner/repo.git',
+      authMethod: 'ssh',
+    })
     expect(invoke).toHaveBeenCalledWith('settings:set', 'language', 'en')
     expect(invoke).toHaveBeenCalledWith('backups:list', 'cursor')
     expect(invoke).toHaveBeenCalledWith('files:reveal', 'C:\\tmp\\file.txt')

src/main/db/connection.ts

@@ -24,6 +24,7 @@ import {
   MIGRATION_004,
   MIGRATION_005,
   MIGRATION_006,
+  MIGRATION_007,
 } from './migrations/index'
 
 /** All migration scripts in order. Index = version - 1. */
@@ -34,6 +35,7 @@ const MIGRATIONS: readonly string[] = [
   MIGRATION_004,
   MIGRATION_005,
   MIGRATION_006,
+  MIGRATION_007,
 ]
 
 /** Lazily-created singleton instance. */

src/main/db/migrations/index.ts

@@ -18,6 +18,7 @@
  *   004 — Add install metadata columns to servers (recipe, setup status, install policy)
  *   005 — Create device_setup_state table for per-device installation state
  *   006 — Create sync_install_intent table for syncing install intent across devices
+ *   007 — Create sync_conflicts table for storing merge conflicts
  */
 
 /**
@@ -197,3 +198,26 @@ CREATE TABLE sync_install_intent (
   PRIMARY KEY (server_id)
 );
 `
+
+/**
+ * Migration 007 — Creates the `sync_conflicts` table for storing merge conflicts
+ * between local and remote versions of registry entities.
+ */
+export const MIGRATION_007 = /* sql */ `
+CREATE TABLE sync_conflicts (
+  id TEXT PRIMARY KEY,
+  entity_type TEXT NOT NULL,
+  entity_id TEXT NOT NULL,
+  server_id TEXT,
+  server_name TEXT NOT NULL,
+  field TEXT NOT NULL,
+  local_value TEXT NOT NULL DEFAULT 'null',
+  remote_value TEXT NOT NULL DEFAULT 'null',
+  resolved INTEGER NOT NULL DEFAULT 0,
+  created_at TEXT NOT NULL,
+  updated_at TEXT NOT NULL
+);
+
+CREATE INDEX idx_sync_conflicts_resolved ON sync_conflicts(resolved);
+CREATE INDEX idx_sync_conflicts_entity_type ON sync_conflicts(entity_type);
+`

src/main/db/servers.repo.ts

@@ -2,7 +2,7 @@
  * @file src/main/db/servers.repo.ts
  *
  * @created 07.03.2026
- * @modified 09.03.2026
+ * @modified 10.03.2026
  *
  * @author Christian Blank <christianblank91@protonmail.com>
  * @copyright 2026
@@ -226,4 +226,14 @@ export class ServersRepo {
   delete(id: string): void {
     this.db.prepare('DELETE FROM servers WHERE id = ?').run(id)
   }
+
+  /**
+   * Updates only the setup status of a server.
+   */
+  updateSetupStatus(id: string, setupStatus: McpServer['setupStatus']): void {
+    const now = new Date().toISOString()
+    this.db
+      .prepare('UPDATE servers SET setup_status = ?, updated_at = ? WHERE id = ?')
+      .run(setupStatus, now, id)
+  }
 }