Resolved conflicts: - index.ts: kept dev's skills/extensions services + added backup init/hooks - handlers.ts: kept dev's new params (mcp, skills) + added teamBackupService - TeamProvisioningService.ts: kept dev's killTeamProcess/stopAllTeams impl - pathDecoder.ts: kept dev's getTaskChangeSummariesBasePath + added app data paths |
||
|---|---|---|
| .. | ||
| main | ||
| preload | ||
| renderer | ||
| shared | ||
| types | ||