feat: add skill update detection via SHA-256 content hashing

- Add content_hash and updated_at fields to skills table (DB migration v6→v7)
- Compute directory content hash on install/import/restore for version tracking
- Add check_updates command: downloads repos, compares hashes, returns update list
- Add update_skill command: backs up old files, re-downloads and replaces SSOT
- Backfill content_hash for existing skills on first update check
- Add "Check Updates" button and per-skill update badge/button in UnifiedSkillsPanel
- Add i18n keys for zh/en/ja
This commit is contained in:
Jason
2026-04-05 19:19:01 +08:00
parent 46488ecd93
commit e3179ad9e4
13 changed files with 660 additions and 14 deletions
+365
View File
@@ -160,6 +160,20 @@ pub struct SkillUninstallResult {
pub backup_path: Option<String>,
}
/// Skill 更新检测结果
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct SkillUpdateInfo {
/// Skill ID
pub id: String,
/// Skill 名称
pub name: String,
/// 当前本地哈希
pub current_hash: Option<String>,
/// 远程最新哈希
pub remote_hash: String,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct SkillBackupEntry {
@@ -632,6 +646,12 @@ impl SkillService {
));
// 创建 InstalledSkill 记录
// 计算内容哈希
let content_hash = Self::compute_dir_hash(&dest).map(Some).unwrap_or_else(|e| {
log::warn!("Failed to compute content hash for {}: {e}", install_name);
None
});
let installed_skill = InstalledSkill {
id: skill.key.clone(),
name: skill.name.clone(),
@@ -647,6 +667,8 @@ impl SkillService {
readme_url,
apps: SkillApps::only(current_app),
installed_at: chrono::Utc::now().timestamp(),
content_hash,
updated_at: 0,
};
// 保存到数据库
@@ -706,6 +728,330 @@ impl SkillService {
Ok(SkillUninstallResult { backup_path })
}
// ========== 更新检测 ==========
/// 计算目录内容的 SHA-256 哈希
///
/// 递归遍历目录下所有非隐藏文件,按相对路径字典序排列,
/// 将 "相对路径\0内容\0" 逐文件 feed 给同一个 hasher。
pub fn compute_dir_hash(dir: &Path) -> Result<String> {
use sha2::{Digest, Sha256};
let mut files: Vec<PathBuf> = Vec::new();
Self::collect_files_for_hash(dir, dir, &mut files)?;
files.sort();
let mut hasher = Sha256::new();
for file_path in &files {
let relative = file_path.strip_prefix(dir).unwrap_or(file_path);
let rel_str = relative.to_string_lossy().replace('\\', "/");
hasher.update(rel_str.as_bytes());
hasher.update(b"\0");
let content = fs::read(file_path)
.with_context(|| format!("读取文件失败: {}", file_path.display()))?;
hasher.update(&content);
hasher.update(b"\0");
}
Ok(format!("{:x}", hasher.finalize()))
}
/// 递归收集目录下所有非隐藏文件
fn collect_files_for_hash(base: &Path, current: &Path, files: &mut Vec<PathBuf>) -> Result<()> {
let entries = fs::read_dir(current)
.with_context(|| format!("读取目录失败: {}", current.display()))?;
for entry in entries {
let entry = entry?;
let name = entry.file_name().to_string_lossy().to_string();
if name.starts_with('.') {
continue;
}
let path = entry.path();
if path.is_dir() {
Self::collect_files_for_hash(base, &path, files)?;
} else {
files.push(path);
}
}
Ok(())
}
/// 检查所有已安装 Skill 的更新
///
/// 仅检查有 repo_owner 的 Skill(本地 Skill 跳过),
/// 按仓库分组下载,避免重复下载同一仓库。
pub async fn check_updates(&self, db: &Arc<Database>) -> Result<Vec<SkillUpdateInfo>> {
let skills = db.get_all_installed_skills()?;
let mut updates = Vec::new();
// 按 (owner, name, branch) 分组
let mut repo_groups: HashMap<(String, String, String), Vec<InstalledSkill>> =
HashMap::new();
for skill in skills.into_values() {
let (owner, name, branch) =
match (&skill.repo_owner, &skill.repo_name, &skill.repo_branch) {
(Some(o), Some(n), Some(b)) => (o.clone(), n.clone(), b.clone()),
(Some(o), Some(n), None) => (o.clone(), n.clone(), "main".to_string()),
_ => continue,
};
repo_groups
.entry((owner, name, branch))
.or_default()
.push(skill);
}
let ssot_dir = Self::get_ssot_dir()?;
for ((owner, name, branch), group_skills) in &repo_groups {
let repo = SkillRepo {
owner: owner.clone(),
name: name.clone(),
branch: branch.clone(),
enabled: true,
};
// 下载仓库 ZIP
let (temp_dir, _used_branch) = match timeout(
std::time::Duration::from_secs(60),
self.download_repo(&repo),
)
.await
{
Ok(Ok(result)) => result,
Ok(Err(e)) => {
log::warn!("检查更新时下载 {}/{} 失败: {e}", owner, name);
continue;
}
Err(_) => {
log::warn!("检查更新时下载 {}/{} 超时", owner, name);
continue;
}
};
// 扫描仓库中的所有 Skill 目录
let mut remote_skills: Vec<DiscoverableSkill> = Vec::new();
let _ = self.scan_dir_recursive(&temp_dir, &temp_dir, &repo, &mut remote_skills);
for skill in group_skills {
// 在远程仓库中找到匹配的 Skill 目录
let remote_match = remote_skills.iter().find(|rs| {
// 匹配方式:安装名称的最后一段
let remote_install_name =
rs.directory.rsplit('/').next().unwrap_or(&rs.directory);
remote_install_name.eq_ignore_ascii_case(&skill.directory)
});
let remote_skill_dir = match remote_match {
Some(rs) => temp_dir.join(&rs.directory),
None => continue,
};
if !remote_skill_dir.exists() {
continue;
}
let remote_hash = match Self::compute_dir_hash(&remote_skill_dir) {
Ok(h) => h,
Err(e) => {
log::warn!("计算远程哈希失败 {}: {e}", skill.id);
continue;
}
};
// 本地哈希:优先数据库,否则实时计算
let local_hash = match &skill.content_hash {
Some(h) => Some(h.clone()),
None => {
let local_dir = ssot_dir.join(&skill.directory);
if local_dir.exists() {
match Self::compute_dir_hash(&local_dir) {
Ok(h) => {
let _ = db.update_skill_hash(&skill.id, &h, 0);
Some(h)
}
Err(_) => None,
}
} else {
None
}
}
};
if local_hash.as_deref() != Some(&remote_hash) {
updates.push(SkillUpdateInfo {
id: skill.id.clone(),
name: skill.name.clone(),
current_hash: local_hash,
remote_hash,
});
}
}
let _ = fs::remove_dir_all(&temp_dir);
}
Ok(updates)
}
/// 更新单个 Skill(重新下载并替换本地文件)
pub async fn update_skill(&self, db: &Arc<Database>, skill_id: &str) -> Result<InstalledSkill> {
let skill = db
.get_installed_skill(skill_id)?
.ok_or_else(|| anyhow!("Skill not found: {skill_id}"))?;
let (owner, name, branch) = match (&skill.repo_owner, &skill.repo_name) {
(Some(o), Some(n)) => (
o.clone(),
n.clone(),
skill
.repo_branch
.clone()
.unwrap_or_else(|| "main".to_string()),
),
_ => return Err(anyhow!("Cannot update local skill: {skill_id}")),
};
let repo = SkillRepo {
owner: owner.clone(),
name: name.clone(),
branch: branch.clone(),
enabled: true,
};
let ssot_dir = Self::get_ssot_dir()?;
// 下载仓库
let (temp_dir, used_branch) = timeout(
std::time::Duration::from_secs(60),
self.download_repo(&repo),
)
.await
.map_err(|_| {
anyhow!(format_skill_error(
"DOWNLOAD_TIMEOUT",
&[("owner", &owner), ("name", &name), ("timeout", "60")],
Some("checkNetwork"),
))
})??;
// 在解压的仓库中查找 Skill 源目录
let mut remote_skills: Vec<DiscoverableSkill> = Vec::new();
let _ = self.scan_dir_recursive(&temp_dir, &temp_dir, &repo, &mut remote_skills);
let remote_match = remote_skills
.iter()
.find(|rs| {
let remote_install_name = rs.directory.rsplit('/').next().unwrap_or(&rs.directory);
remote_install_name.eq_ignore_ascii_case(&skill.directory)
})
.ok_or_else(|| {
let _ = fs::remove_dir_all(&temp_dir);
anyhow!(format_skill_error(
"SKILL_DIR_NOT_FOUND",
&[("path", &skill.directory)],
Some("checkRepoUrl"),
))
})?;
let source = temp_dir.join(&remote_match.directory);
if !source.exists() {
let _ = fs::remove_dir_all(&temp_dir);
return Err(anyhow!(format_skill_error(
"SKILL_DIR_NOT_FOUND",
&[("path", &source.display().to_string())],
Some("checkRepoUrl"),
)));
}
// 备份旧文件
let _ = Self::create_uninstall_backup(&skill);
// 删除旧 SSOT 目录并复制新文件
let dest = ssot_dir.join(&skill.directory);
if dest.exists() {
fs::remove_dir_all(&dest)?;
}
Self::copy_dir_recursive(&source, &dest)?;
let _ = fs::remove_dir_all(&temp_dir);
// 计算新哈希 + 解析新元数据
let new_hash = Self::compute_dir_hash(&dest).ok();
let skill_md = dest.join("SKILL.md");
let (new_name, new_description) = Self::read_skill_name_desc(&skill_md, &skill.directory);
// 更新 readme_url
let doc_path = skill
.readme_url
.as_deref()
.and_then(Self::extract_doc_path_from_url)
.unwrap_or_else(|| format!("{}/SKILL.md", skill.directory.trim_end_matches('/')));
let readme_url = Some(Self::build_skill_doc_url(
&owner,
&name,
&used_branch,
&doc_path,
));
let updated_skill = InstalledSkill {
id: skill.id.clone(),
name: new_name,
description: new_description,
directory: skill.directory.clone(),
repo_owner: skill.repo_owner.clone(),
repo_name: skill.repo_name.clone(),
repo_branch: Some(used_branch),
readme_url,
apps: skill.apps.clone(),
installed_at: skill.installed_at,
content_hash: new_hash,
updated_at: chrono::Utc::now().timestamp(),
};
db.save_skill(&updated_skill)?;
// 同步到所有已启用的应用目录
for app in updated_skill.apps.enabled_apps() {
if let Err(e) = Self::sync_to_app_dir(&updated_skill.directory, &app) {
log::warn!("同步更新后的 skill 到 {:?} 失败: {e}", app);
}
}
log::info!("Skill {} 更新成功", updated_skill.name);
Ok(updated_skill)
}
/// 为缺少 content_hash 的已安装 Skill 补算哈希
pub fn backfill_content_hashes(db: &Arc<Database>) -> Result<usize> {
let skills = db.get_all_installed_skills()?;
let ssot_dir = Self::get_ssot_dir()?;
let mut count = 0;
for skill in skills.values() {
if skill.content_hash.is_some() {
continue;
}
let skill_dir = ssot_dir.join(&skill.directory);
if !skill_dir.exists() {
continue;
}
match Self::compute_dir_hash(&skill_dir) {
Ok(hash) => {
let _ = db.update_skill_hash(&skill.id, &hash, 0);
count += 1;
}
Err(e) => {
log::warn!("补算哈希失败 {}: {e}", skill.id);
}
}
}
if count > 0 {
log::info!("已为 {count} 个 Skill 补算内容哈希");
}
Ok(count)
}
pub fn list_backups() -> Result<Vec<SkillBackupEntry>> {
let backup_dir = Self::get_backup_dir()?;
let mut entries = Vec::new();
@@ -800,9 +1146,13 @@ impl SkillService {
let mut restored_skill = metadata.skill;
restored_skill.installed_at = Utc::now().timestamp();
restored_skill.apps = SkillApps::only(current_app);
restored_skill.updated_at = 0;
Self::copy_dir_recursive(&backup_skill_dir, &restore_path)?;
// 重新计算内容哈希
restored_skill.content_hash = Self::compute_dir_hash(&restore_path).ok();
if let Err(err) = db.save_skill(&restored_skill) {
let _ = fs::remove_dir_all(&restore_path);
return Err(err.into());
@@ -991,6 +1341,10 @@ impl SkillService {
let (id, repo_owner, repo_name, repo_branch, readme_url) =
build_repo_info_from_lock(&agents_lock, &dir_name);
// 计算内容哈希
let ssot_skill_dir = ssot_dir.join(&dir_name);
let content_hash = Self::compute_dir_hash(&ssot_skill_dir).ok();
// 创建记录
let skill = InstalledSkill {
id,
@@ -1003,6 +1357,8 @@ impl SkillService {
readme_url,
apps,
installed_at: chrono::Utc::now().timestamp(),
content_hash,
updated_at: 0,
};
// 保存到数据库
@@ -1965,6 +2321,9 @@ impl SkillService {
}
Self::copy_dir_recursive(&skill_dir, &dest)?;
// 计算内容哈希
let content_hash = Self::compute_dir_hash(&dest).ok();
// 创建 InstalledSkill 记录
let skill = InstalledSkill {
id: format!("local:{install_name}"),
@@ -1977,6 +2336,8 @@ impl SkillService {
readme_url: None,
apps: SkillApps::only(current_app),
installed_at: chrono::Utc::now().timestamp(),
content_hash,
updated_at: 0,
};
// 保存到数据库
@@ -2288,6 +2649,8 @@ pub fn migrate_skills_to_ssot(db: &Arc<Database>) -> Result<usize> {
let (id, repo_owner, repo_name, repo_branch, readme_url) =
build_repo_info_from_lock(&agents_lock, &directory);
let content_hash = SkillService::compute_dir_hash(&ssot_path).ok();
let skill = InstalledSkill {
id,
name,
@@ -2299,6 +2662,8 @@ pub fn migrate_skills_to_ssot(db: &Arc<Database>) -> Result<usize> {
readme_url,
apps,
installed_at: chrono::Utc::now().timestamp(),
content_hash,
updated_at: 0,
};
db.save_skill(&skill)?;