Commit Graph

7 Commits

Author SHA1 Message Date
newbie d2bd955aa9 feat(skills): batch resolve all sync conflicts (0.9.10)
Adds POST /dsh-brain/sync/resolve-all {action: keep_local|take_cloud} and 全部保留本地 / 全部采用云端 buttons with an inline confirmation step. Partial failures are reported per item (resolved / failed lists) instead of aborting the batch; per-item resolution stays available.
2026-11-14 16:05:09 +08:00
newbie dbf39339c2 feat(skills): auto-resolve sync conflicts by content and newer timestamp (0.9.9)
Same-name skills no longer always stop for a human: identical bytes adopt the delivery marker in place, differing bytes compare local file mtime with the center updated_at and the newer side wins (cloud overwrite backs the local folder up first). Equal or missing timestamps, unsupported upload layouts and script-review flags still surface as per-item conflicts, so there is no batch action.
2026-11-14 14:24:36 +08:00
newbie 89af1f4c7c fix: keep skill source state mutually exclusive 2026-11-12 19:04:40 +08:00
QQ 5b9f1d7ec7 更新 lib/skill-sync.js 2026-11-12 00:01:49 +08:00
QQ cc1912ab92 更新 lib/skill-sync.js 2026-11-11 23:14:37 +08:00
QQ 12044dc45f 更新 lib/skill-sync.js 2026-11-11 11:07:37 +08:00
QQ 3aaddfe997 更新 lib/skill-sync.js 2026-11-11 10:51:26 +08:00