fix(ui): fetch each repository once when the dashboard updates skills (#931)

* fix(ui): fetch each repository once when the dashboard updates skills

Updating many skills from the Updates tab cloned the repository once per
skill and reinstalled every one, so 31 skills from 8 repositories took over
a minute where `skillshare update --all` takes 16 seconds, and unchanged
skills were reported as updated.

The update stream and the update-all endpoint now group the request's
skills by repository and branch and go through install.UpdateSkillsFromRepo,
as the CLI does. A skill that already matches upstream is left alone and
reported as up to date; the Updates tab shows and counts it that way.
Results still arrive in request order, which the dashboard relies on.

Updating a single skill and switching its branch still reinstall. Those
paths now also pass the configured parse options to the installer.

* fix(ui): keep checkouts and recorded sources when updates share a fetch

Grouping a dashboard update by repository sent every skill through the
discovery installer. A root skill kept as a Git checkout was replaced by
a plain copy, losing its repository, and an updated skill had its source
recorded in the repository's canonical spelling, which a project
declaration written with another spelling no longer matches.

A checkout now updates on its own by pulling, as before, and an updated
skill keeps the source its record had, as updating one skill does.
This commit is contained in:
Willie
2026-11-17 02:43:57 +08:00
committed by GitHub
parent 2cd58cb81b
commit 310478c28d
21 changed files with 353 additions and 32 deletions
+152 -15
View File
@@ -38,6 +38,10 @@ type updateResultItem struct {
Kind string `json:"kind,omitempty"`
}
// locallyModifiedMessage is the reason a skill edited since install is skipped;
// the dashboard offers Force Retry on its "(try force update)" hint.
const locallyModifiedMessage = "has local changes since install (try force update)"
func (s *Server) updateAuditThreshold() string {
if s.IsProjectMode() && s.projectCfg != nil {
if threshold, err := audit.NormalizeThreshold(s.projectCfg.Audit.BlockThreshold); err == nil {
@@ -440,7 +444,7 @@ func (s *Server) reinstallRegularSkill(name, skillPath, branch string, force, sk
return updateResultItem{Name: name, Action: "error", Message: "no metadata found"}
}
if !force && entry.LocallyModified(skillPath, follow...) {
return updateResultItem{Name: name, Action: "skipped", Message: "has local changes since install (try force update)"}
return updateResultItem{Name: name, Action: "skipped", Message: locallyModifiedMessage}
}
source, err := install.RecordedSource(entry, s.parseOpts())
if err != nil {
@@ -456,21 +460,10 @@ func (s *Server) reinstallRegularSkill(name, skillPath, branch string, force, sk
source.ApplyRecordedBranch(branch)
sourceDir := s.cfg.EffectiveSkillsSource()
opts := install.InstallOptions{
Force: true,
AuditOverride: force,
Reinstall: force,
Update: true,
SkipAudit: skipAudit,
AuditThreshold: s.updateAuditThreshold(),
SourceDir: sourceDir,
}
opts := s.skillUpdateOpts(force, skipAudit)
if len(follow) > 0 {
opts.SourceFollow = follow[0]
}
if s.IsProjectMode() {
opts.AuditProjectRoot = s.projectRoot
}
result, err := install.Install(source, skillPath, opts)
if err != nil {
return updateResultItem{
@@ -512,15 +505,159 @@ func (s *Server) updateAll(force, skipAudit bool) []updateResultItem {
// Update regular skills with source metadata
skills, err := getServerUpdatableSkills(s.cfg.EffectiveSkillsSource(), s.skillsStore, walk)
if err == nil {
batch := s.newSkillBatch(skills, force, skipAudit, walk.Follow)
for _, skill := range skills {
skillPath := filepath.Join(s.cfg.EffectiveSkillsSource(), skill)
results = append(results, s.updateRegularSkill(skill, skillPath, force, skipAudit, walk.Follow))
results = append(results, batch.update(skill))
}
}
return results
}
// skillUpdateOpts returns the install options every regular-skill update uses.
func (s *Server) skillUpdateOpts(force, skipAudit bool) install.InstallOptions {
opts := install.InstallOptions{
ParseOptions: s.parseOpts(),
Force: true,
AuditOverride: force,
Reinstall: force,
Update: true,
SkipAudit: skipAudit,
AuditThreshold: s.updateAuditThreshold(),
SourceDir: s.cfg.EffectiveSkillsSource(),
}
if s.IsProjectMode() {
opts.AuditProjectRoot = s.projectRoot
}
return opts
}
// skillBatch updates the regular skills of one request. Skills installed from
// the same repository and branch share one fetch, and a skill that already
// matches the fetched state is reported up to date instead of reinstalled, as
// `skillshare update` does. Callers hold s.mu for every update call.
type skillBatch struct {
s *Server
names []string // every regular skill the request updates
force bool
skipAudit bool
follow *sourcewalk.Follow
done map[string]updateResultItem // results of the repositories already fetched
}
func (s *Server) newSkillBatch(names []string, force, skipAudit bool, follow *sourcewalk.Follow) *skillBatch {
return &skillBatch{s: s, names: names, force: force, skipAudit: skipAudit, follow: follow, done: make(map[string]updateResultItem)}
}
// update returns the result for one skill. The first skill of a repository
// fetches it and settles every other skill of the request that shares it.
func (b *skillBatch) update(name string) updateResultItem {
if item, ok := b.done[name]; ok {
return item
}
entry := b.s.skillsStore.GetByPath(name)
if entry == nil || entry.RepoURL == "" {
skillPath := filepath.Join(b.s.cfg.EffectiveSkillsSource(), name)
return b.s.updateRegularSkill(name, skillPath, b.force, b.skipAudit, b.follow)
}
b.updateRepo(entry.RepoURL, entry.Branch)
return b.done[name]
}
// updateRepo fetches one repository and updates the request's skills recorded
// from it at branch.
func (b *skillBatch) updateRepo(repoURL, branch string) {
s := b.s
sourceDir := s.cfg.EffectiveSkillsSource()
targets := make(map[string]string) // repo subdir → skill path
owners := make(map[string]string) // repo subdir → skill name
sources := make(map[string]string) // skill name → the source its record keeps
for _, name := range b.names {
if _, ok := b.done[name]; ok {
continue
}
entry := s.skillsStore.GetByPath(name)
if entry == nil || entry.RepoURL != repoURL || entry.Branch != branch {
continue
}
skillPath := filepath.Join(sourceDir, name)
if install.IsGitRepo(skillPath) {
// A skill kept as a checkout updates by pulling; a copy from the
// shared fetch would replace its repository.
b.done[name] = s.updateRegularSkill(name, skillPath, b.force, b.skipAudit, b.follow)
continue
}
if refusal := s.refuseFollowedCheckout(name, skillPath, []*sourcewalk.Follow{b.follow}); refusal != nil {
b.done[name] = *refusal
continue
}
if !b.force && entry.LocallyModified(skillPath, b.follow) {
b.done[name] = updateResultItem{Name: name, Action: "skipped", Message: locallyModifiedMessage}
continue
}
subdir := entry.Subdir
if subdir == "" {
subdir = "."
}
if owners[subdir] == name {
continue // named twice in the request
}
if _, taken := targets[subdir]; taken {
// A second local copy of the same repo path updates on its own.
b.done[name] = s.updateRegularSkill(name, skillPath, b.force, b.skipAudit, b.follow)
continue
}
targets[subdir] = skillPath
owners[subdir] = name
sources[name] = install.RecordedSourceString(entry, s.parseOpts())
}
if len(targets) == 0 {
return
}
opts := s.skillUpdateOpts(b.force, b.skipAudit)
opts.SourceFollow = b.follow
res, err := install.UpdateSkillsFromRepo(repoURL, branch, targets, opts)
for subdir, name := range owners {
item := updateResultItem{Name: name}
switch {
case err != nil:
item.Action, item.Message = "error", err.Error()
case res.Errors[subdir] != nil:
item.Action, item.Message = "error", res.Errors[subdir].Error()
case res.Results[subdir] != nil:
item.Action, item.Message = "updated", "reinstalled from source"
if label := res.Results[subdir].AuditRiskLabel; label != "" {
item.AuditRiskScore = res.Results[subdir].AuditRiskScore
item.AuditRiskLabel = label
}
case res.Current[subdir]:
item.Action = "up-to-date"
default:
item.Action = "skipped"
}
b.done[name] = item
}
if err != nil || s.reloadSkillsStore() != nil {
return
}
// The shared fetch records each source in the repository's canonical
// spelling. Declarations match the spelling a skill was installed with, so
// the record keeps it, as updating one skill does.
respelled := false
for name, source := range sources {
if entry := s.skillsStore.GetByPath(name); entry != nil && entry.Source != source && b.done[name].Action == "updated" {
entry.Source = source
respelled = true
}
}
if respelled {
if saveErr := s.skillsStore.Save(sourceDir); saveErr != nil {
log.Printf("warning: failed to keep recorded sources: %v", saveErr)
}
}
}
// getServerUpdatableSkills returns relative paths of skills that have metadata with a remote source.
// It walks the source directory recursively to find nested skills (e.g. utils/ascii-box-check).
func getServerUpdatableSkills(sourceDir string, store *install.MetadataStore, walk sourcewalk.Options) ([]string, error) {
+11 -8
View File
@@ -81,8 +81,7 @@ func (s *Server) handleUpdateStream(w http.ResponseWriter, r *http.Request) {
continue
}
// Regular skill
skillPath := filepath.Join(source, name)
items = append(items, updateItem{name: name, isRepo: false, path: skillPath})
items = append(items, updateItem{name: name})
}
} else {
// Update all: tracked repos + regular skills
@@ -101,15 +100,19 @@ func (s *Server) handleUpdateStream(w http.ResponseWriter, r *http.Request) {
s.mu.RUnlock()
if err == nil {
for _, skill := range skills {
items = append(items, updateItem{
name: skill,
isRepo: false,
path: filepath.Join(source, skill),
})
items = append(items, updateItem{name: skill})
}
}
}
var skillNames []string
for _, item := range items {
if !item.invalid && !item.agent && !item.isRepo {
skillNames = append(skillNames, item.name)
}
}
batch := s.newSkillBatch(skillNames, force, skipAudit, walk.Follow)
safeSend("start", map[string]int{"total": len(items)})
var results []updateResultItem
@@ -141,7 +144,7 @@ func (s *Server) handleUpdateStream(w http.ResponseWriter, r *http.Request) {
case item.isRepo:
result = s.updateTrackedRepo(item.name, item.path, s.cfg.EffectiveSkillsSource(), force, skipAudit, walk.Follow)
default:
result = s.updateRegularSkill(item.name, item.path, force, skipAudit, walk.Follow)
result = batch.update(item.name)
}
s.mu.Unlock()
+156
View File
@@ -1,6 +1,8 @@
package server
import (
"net/http"
"net/http/httptest"
"os"
"os/exec"
"path/filepath"
@@ -223,3 +225,157 @@ func TestUpdateAgent_AzureOnPrem_UsesParseOpts(t *testing.T) {
t.Errorf("Subdir = %q, want %q", source.Subdir, "agents/my-agent.md")
}
}
// writeRemoteSkill commits skills/<name>/SKILL.md with body to remote.
func writeRemoteSkill(t *testing.T, remote, name, body string) {
t.Helper()
dir := filepath.Join(remote, "skills", name)
if err := os.MkdirAll(dir, 0755); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(filepath.Join(dir, "SKILL.md"), []byte("---\nname: "+name+"\n---\n"+body+"\n"), 0644); err != nil {
t.Fatal(err)
}
runGit(t, remote, "add", ".")
runGit(t, remote, "commit", "-m", name+" "+body)
}
// recordRemoteSkills creates a remote holding the named skills and records an
// outdated local copy of each in the server's store.
func recordRemoteSkills(t *testing.T, s *Server, src string, names ...string) string {
t.Helper()
remote := t.TempDir()
initGitRepo(t, remote)
for _, name := range names {
writeRemoteSkill(t, remote, name, "v1")
if err := os.MkdirAll(filepath.Join(src, name), 0755); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(filepath.Join(src, name, "SKILL.md"), []byte("---\nname: "+name+"\n---\nold\n"), 0644); err != nil {
t.Fatal(err)
}
s.skillsStore.Set(name, &install.MetadataEntry{
Source: "file://" + remote + "//skills/" + name,
RepoURL: "file://" + remote,
Subdir: "skills/" + name,
})
}
if err := s.skillsStore.Save(src); err != nil {
t.Fatal(err)
}
return remote
}
func streamUpdate(t *testing.T, s *Server, names string) []updateResultItem {
t.Helper()
rr := httptest.NewRecorder()
s.handleUpdateStream(rr, httptest.NewRequest(http.MethodGet, "/api/update/stream?skipAudit=true&names="+names, nil))
return updateResults(t, rr, true)
}
// Skills of one repository share a fetch, so the stream must still answer in
// request order (the dashboard pairs results with names by position) and
// report a skill that already matches the remote as up to date.
func TestHandleUpdateStream_SameRepoSkillsReportInRequestOrder(t *testing.T) {
s, src := newTestServer(t)
s.skillsStore = install.NewMetadataStore()
shared := recordRemoteSkills(t, s, src, "a1", "a2")
recordRemoteSkills(t, s, src, "b")
run := func() string {
var got []string
for _, item := range streamUpdate(t, s, "a1,b,a2") {
got = append(got, item.Name+"="+item.Action)
}
return strings.Join(got, " ")
}
if got, want := run(), "a1=updated b=updated a2=updated"; got != want {
t.Fatalf("first update: got %q, want %q", got, want)
}
writeRemoteSkill(t, shared, "a2", "v2")
if got, want := run(), "a1=up-to-date b=up-to-date a2=updated"; got != want {
t.Fatalf("after a2 changed upstream: got %q, want %q", got, want)
}
}
// One skill's outcome must not change its repo-mates', and the messages the
// dashboard matches for Force Retry and Purge must survive the shared fetch.
func TestHandleUpdate_AllReportsEachSkillOfSharedRepo(t *testing.T) {
s, src := newTestServer(t)
s.skillsStore = install.NewMetadataStore()
remote := recordRemoteSkills(t, s, src, "current", "edited", "gone")
streamUpdate(t, s, "current,edited,gone")
if err := os.WriteFile(filepath.Join(src, "edited", "SKILL.md"), []byte("# my edit\n"), 0644); err != nil {
t.Fatal(err)
}
runGit(t, remote, "rm", "-r", "skills/gone")
runGit(t, remote, "commit", "-m", "drop gone")
got := map[string]updateResultItem{}
for _, item := range updateResults(t, postUpdate(s, `{"all":true,"skipAudit":true}`), false) {
got[item.Name] = item
}
for name, want := range map[string]struct{ action, message string }{
"current": {"up-to-date", ""},
"edited": {"skipped", "(try force update)"},
"gone": {"error", "not found in repository"},
} {
if item := got[name]; item.Action != want.action || !strings.Contains(item.Message, want.message) {
t.Errorf("%s: got %q (%s), want %q containing %q", name, item.Action, item.Message, want.action, want.message)
}
}
}
// A root skill kept as a Git checkout updates by pulling, so the shared fetch
// must not swap a plain copy over it and drop its .git directory.
func TestHandleUpdateStream_RootSkillCheckoutKeepsItsRepository(t *testing.T) {
s, src := newTestServer(t)
s.skillsStore = install.NewMetadataStore()
remote := t.TempDir()
initGitRepo(t, remote)
writeRootSkill := func(body string) {
t.Helper()
if err := os.WriteFile(filepath.Join(remote, "SKILL.md"), []byte("---\nname: solo\n---\n"+body+"\n"), 0644); err != nil {
t.Fatal(err)
}
runGit(t, remote, "add", ".")
runGit(t, remote, "commit", "-m", body)
}
writeRootSkill("v1")
runGit(t, src, "clone", "file://"+remote, "solo")
s.skillsStore.Set("solo", &install.MetadataEntry{Source: "file://" + remote, RepoURL: "file://" + remote})
if err := s.skillsStore.Save(src); err != nil {
t.Fatal(err)
}
writeRootSkill("v2")
if got := streamUpdate(t, s, "solo"); len(got) != 1 || got[0].Action != "updated" {
t.Fatalf("update: got %+v, want one updated item", got)
}
if !install.IsGitRepo(filepath.Join(src, "solo")) {
t.Fatal("the checkout lost its .git directory")
}
}
// The shared fetch records the source in the repository's canonical spelling.
// A project declares the skill by the spelling it was installed with, so the
// record must keep that spelling or the declaration stops matching.
func TestHandleUpdateStream_KeepsRecordedSourceSpelling(t *testing.T) {
s, src := newTestServer(t)
s.skillsStore = install.NewMetadataStore()
remote := recordRemoteSkills(t, s, src, "demo")
spelling := "file://" + remote + "/.//skills/demo"
s.skillsStore.GetByPath("demo").Source = spelling
if err := s.skillsStore.Save(src); err != nil {
t.Fatal(err)
}
if got := streamUpdate(t, s, "demo"); len(got) != 1 || got[0].Action != "updated" {
t.Fatalf("update: got %+v, want one updated item", got)
}
if got := s.skillsStore.GetByPath("demo").Source; got != spelling {
t.Fatalf("recorded source = %q, want %q", got, spelling)
}
}
+1
View File
@@ -959,6 +959,7 @@
"update.summary.blocked": "{count} blockiert",
"update.summary.failed": "{count} fehlgeschlagen",
"update.summary.skipped": "{count} übersprungen",
"update.summary.upToDate": "{count} aktuell",
"update.summary.updated": "{count} aktualisiert",
"update.updating.forceRetry": "Erneut erzwingen",
"update.updating.purge": "Löschen",
+1
View File
@@ -881,6 +881,7 @@
"update.summary.blocked": "{count} blocked",
"update.summary.failed": "{count} failed",
"update.summary.skipped": "{count} skipped",
"update.summary.upToDate": "{count} up to date",
"update.summary.updated": "{count} updated",
"update.updating.forceRetry": "Force retry",
"update.updating.purge": "Prune",
+1
View File
@@ -959,6 +959,7 @@
"update.summary.blocked": "{count} bloqueados",
"update.summary.failed": "{count} fallidos",
"update.summary.skipped": "{count} omitidos",
"update.summary.upToDate": "{count} al día",
"update.summary.updated": "{count} actualizados",
"update.updating.forceRetry": "Forzar reintento",
"update.updating.purge": "Purgar",
+1
View File
@@ -959,6 +959,7 @@
"update.summary.blocked": "{count} مسدود شده",
"update.summary.failed": "{count} ناموفق",
"update.summary.skipped": "{count} رد شده",
"update.summary.upToDate": "{count} به‌روز",
"update.summary.updated": "{count} به‌روز شد",
"update.updating.forceRetry": "تلاش مجدد اجباری",
"update.updating.purge": "پاکسازی",
+1
View File
@@ -959,6 +959,7 @@
"update.summary.blocked": "{count} bloqué(s)",
"update.summary.failed": "{count} échoué(s)",
"update.summary.skipped": "{count} ignoré(s)",
"update.summary.upToDate": "{count} à jour",
"update.summary.updated": "{count} mis à jour",
"update.updating.forceRetry": "Forcer la réessai",
"update.updating.purge": "Purger",
+1
View File
@@ -959,6 +959,7 @@
"update.summary.blocked": "{count} diblokir",
"update.summary.failed": "{count} gagal",
"update.summary.skipped": "{count} dilewati",
"update.summary.upToDate": "{count} sudah terbaru",
"update.summary.updated": "{count} diperbarui",
"update.updating.forceRetry": "Paksa Coba Lagi",
"update.updating.purge": "Hapus Bersih",
+1
View File
@@ -959,6 +959,7 @@
"update.summary.blocked": "{count} 件ブロック済み",
"update.summary.failed": "{count} 件失敗",
"update.summary.skipped": "{count} 件スキップ済み",
"update.summary.upToDate": "{count} 件が最新",
"update.summary.updated": "{count} 件更新済み",
"update.updating.forceRetry": "強制再試行",
"update.updating.purge": "削除",
+1
View File
@@ -959,6 +959,7 @@
"update.summary.blocked": "{count}개 차단됨",
"update.summary.failed": "{count}개 실패",
"update.summary.skipped": "{count}개 건너뜀",
"update.summary.upToDate": "{count}개 최신 상태",
"update.summary.updated": "{count}개 업데이트됨",
"update.updating.forceRetry": "강제 재시도",
"update.updating.purge": "제거",
+1
View File
@@ -959,6 +959,7 @@
"update.summary.blocked": "{count} bloqueado(s)",
"update.summary.failed": "{count} falhou(aram)",
"update.summary.skipped": "{count} ignorado(s)",
"update.summary.upToDate": "{count} em dia",
"update.summary.updated": "{count} atualizado(s)",
"update.updating.forceRetry": "Forçar Nova Tentativa",
"update.updating.purge": "Limpar",
+1
View File
@@ -959,6 +959,7 @@
"update.summary.blocked": "{count} 个已拦截",
"update.summary.failed": "{count} 个失败",
"update.summary.skipped": "{count} 个已跳过",
"update.summary.upToDate": "{count} 个已是最新",
"update.summary.updated": "{count} 个已更新",
"update.updating.forceRetry": "强制重试",
"update.updating.purge": "清除",
+1
View File
@@ -959,6 +959,7 @@
"update.summary.blocked": "已封鎖 {count} 個",
"update.summary.failed": "失敗 {count} 個",
"update.summary.skipped": "已跳過 {count} 個",
"update.summary.upToDate": "已是最新 {count} 個",
"update.summary.updated": "已更新 {count} 個",
"update.updating.forceRetry": "強制重試",
"update.updating.purge": "清除",
+11
View File
@@ -168,6 +168,17 @@ describe('UpdatePage', () => {
await waitFor(() => expect(localStorage.getItem('skillshare.updateCheckCache.global')).toContain('"sub/helper.md":{"status":"up-to-date"'));
});
it('counts a skill that needed no change as up to date', async () => {
vi.mocked(api.listSkills).mockResolvedValue({ resources: [nestedSkill] });
streamResult({ name: nestedSkill.relPath, action: 'up-to-date', isRepo: false });
const user = userEvent.setup();
renderUpdatePage('skill');
await user.click(await screen.findByRole('button', { name: /update all/i }));
expect(await screen.findByText(/1 up to date/)).toBeInTheDocument();
});
it('purges an agent deleted upstream as an agent', async () => {
vi.mocked(api.listSkills).mockResolvedValue({ resources: [nestedAgent] });
vi.mocked(api.batchUninstall).mockResolvedValue({ results: [] } as never);
+7 -4
View File
@@ -58,7 +58,7 @@ export interface UpdateUnit {
source?: string;
}
type RunStatus = 'pending' | 'in-progress' | 'success' | 'error' | 'blocked' | 'skipped';
type RunStatus = 'pending' | 'in-progress' | 'success' | 'up-to-date' | 'error' | 'blocked' | 'skipped';
interface RunState {
status: RunStatus;
@@ -399,10 +399,11 @@ export default function UpdatePage({ kind }: { kind: Kind }) {
return next;
});
const tally = { success: 0, skipped: 0, blocked: 0, error: 0 } as Record<RunStatus, number>;
const tally = { success: 0, 'up-to-date': 0, skipped: 0, blocked: 0, error: 0 } as Record<RunStatus, number>;
for (const s of run.values()) tally[s.status] = (tally[s.status] ?? 0) + 1;
const tallyText = [
tally.success && t('update.summary.updated', { count: tally.success }),
tally['up-to-date'] && t('update.summary.upToDate', { count: tally['up-to-date'] }),
tally.skipped && t('update.summary.skipped', { count: tally.skipped }),
tally.blocked && t('update.summary.blocked', { count: tally.blocked }),
tally.error && t('update.summary.failed', { count: tally.error }),
@@ -467,6 +468,8 @@ export default function UpdatePage({ kind }: { kind: Kind }) {
return <span className="inline-flex items-center gap-2 text-[13px] font-semibold text-ink"><Loader2 size={13} className="animate-spin" />{r.message ?? t('update.status.updating')}</span>;
case 'success':
return <span className="inline-flex items-center gap-1.5 text-[13px] font-semibold text-ok"><Check size={15} strokeWidth={2.6} className="ss-pop" />{t('update.status.updated')}</span>;
case 'up-to-date':
return <span className="ss-st ok">{t('update.check.upToDate')}</span>;
case 'skipped':
// A skill skipped for its local changes can be overwritten from its row.
if (isForceRetryable(r.message)) {
@@ -887,8 +890,8 @@ function actionToStatus(action: string): RunStatus {
case 'updated': return 'success';
case 'error': return 'error';
case 'blocked': return 'blocked';
case 'skipped':
case 'up-to-date': return 'skipped';
case 'up-to-date': return 'up-to-date';
case 'skipped': return 'skipped';
default: return 'success';
}
}
+1 -1
View File
@@ -106,7 +106,7 @@ Some pages show a count in the sidebar when they need attention. The counts refr
The Git conflict comparison uses complete file versions. Choosing a deleted version deletes that file in the merge; non-conflicting files merge normally. Both commit histories remain available. Metadata conflicts resolve automatically. Binary files and files larger than 16 KiB can be selected but have no text preview. If either reviewed revision changes before you apply your choices, the dialog refreshes and requires new choices. After the merge, push to share the result with your other computer.
On the **Updates** tab, a progress bar tracks the update run and the active row is marked while it updates. Blocked or failed updates appear in a separate section. After a successful update, the tab checks for pending sync changes of that kind. **Sync Now** appears only when there are changes to apply; otherwise it reports that no sync is needed. Existing symlinks already read updated source content. If the sync check fails, the tab shows the error and offers **Retry** instead of reporting that everything is up to date. Followed Git checkouts are listed as informational rows with their link name and target path. Like `skillshare update --all`, this tab does not check, update, or force-retry them; manage those checkouts yourself or use an explicit CLI update by name.
On the **Updates** tab, a progress bar tracks the update run and the active row is marked while it updates. Blocked or failed updates appear in a separate section. Skills from the same repository share one fetch, and a skill that did not change upstream is left alone and shown as up to date. After a successful update, the tab checks for pending sync changes of that kind. **Sync Now** appears only when there are changes to apply; otherwise it reports that no sync is needed. Existing symlinks already read updated source content. If the sync check fails, the tab shows the error and offers **Retry** instead of reporting that everything is up to date. Followed Git checkouts are listed as informational rows with their link name and target path. Like `skillshare update --all`, this tab does not check, update, or force-retry them; manage those checkouts yourself or use an explicit CLI update by name.
Old links such as `/collect`, `/install`, `/search`, `/trash`, `/analyze`, `/backup`, `/log`, and `/doctor` redirect to their new place.
@@ -106,7 +106,7 @@ skillshare ui start --clear-cache
Git の競合比較ではファイル全体のバージョンを選びます。ファイルごとにローカルかリモートを選ぶか、**すべてローカルを保持**/**すべてリモートを保持**で一括選択し、適用前に個別の選択を変更できます。削除された側を選ぶと、そのファイルはマージで削除されます。両方のコミット履歴は保持され、キャンセルしてもファイルは変わりません。
**Updates** タブでは、プログレスバーに更新の進行状況が表示され、更新中の行が示されます。ブロックされた更新や失敗した更新は別のセクションに表示されます。更新が成功すると、その種類の同期に未反映の変更があるか確認します。**Sync Now** は適用する変更がある場合にだけ表示され、変更がなければ同期不要と表示されます。既存の symlink は更新された source の内容をすでに読み取れます。同期の確認に失敗した場合は、最新状態と表示する代わりにエラーと **Retry** が表示されます。 たどられた Git チェックアウトは、リンク名とターゲットパスを含む情報行として表示されます。`skillshare update --all` と同様、このタブではチェック、更新、強制再試行を行いません。チェックアウトは自分で管理するか、CLI で名前を指定して更新してください。
**Updates** タブでは、プログレスバーに更新の進行状況が表示され、更新中の行が示されます。ブロックされた更新や失敗した更新は別のセクションに表示されます。同じリポジトリの skill は 1 回の取得でまとめて更新され、upstream で変更のない skill はそのまま残り、最新と表示されます。更新が成功すると、その種類の同期に未反映の変更があるか確認します。**Sync Now** は適用する変更がある場合にだけ表示され、変更がなければ同期不要と表示されます。既存の symlink は更新された source の内容をすでに読み取れます。同期の確認に失敗した場合は、最新状態と表示する代わりにエラーと **Retry** が表示されます。 たどられた Git チェックアウトは、リンク名とターゲットパスを含む情報行として表示されます。`skillshare update --all` と同様、このタブではチェック、更新、強制再試行を行いません。チェックアウトは自分で管理するか、CLI で名前を指定して更新してください。
`/collect`、`/install`、`/search`、`/trash`、`/analyze`、`/backup`、`/log`、`/doctor` などの古いリンクは、新しい場所にリダイレクトされます。
@@ -106,7 +106,7 @@ skillshare ui start --clear-cache
Git 충돌 비교에서는 파일 전체 버전을 선택합니다. 파일마다 로컬 또는 원격을 고르거나 **모두 로컬 유지**/**모두 원격 유지**로 한 번에 선택한 뒤 적용 전에 개별 선택을 바꿀 수 있습니다. 삭제된 쪽을 선택하면 병합에서 해당 파일이 삭제됩니다. 양쪽 커밋 기록은 유지되며 취소하면 파일은 바뀌지 않습니다.
**Updates** 탭의 진행률 표시줄은 업데이트 진행 상황을 보여 주며 업데이트 중인 행도 표시됩니다. 차단되거나 실패한 업데이트는 별도 섹션에 표시됩니다. 업데이트가 성공하면 해당 종류에 적용할 동기화 변경 사항이 있는지 확인합니다. **Sync Now**는 적용할 변경 사항이 있을 때만 표시되며, 없으면 동기화가 필요 없다고 안내합니다. 기존 symlink는 이미 갱신된 source 내용을 읽습니다. 동기화 확인에 실패하면 최신 상태라고 표시하는 대신 오류와 **Retry**를 표시합니다. 링크를 따라 발견한 Git 체크아웃은 링크 이름과 대상 경로가 있는 정보 행으로 표시됩니다. `skillshare update --all`처럼 이 탭에서는 확인, 업데이트 또는 강제 재시도를 하지 않습니다. 체크아웃을 직접 관리하거나 CLI에서 이름을 지정해 업데이트하세요.
**Updates** 탭의 진행률 표시줄은 업데이트 진행 상황을 보여 주며 업데이트 중인 행도 표시됩니다. 차단되거나 실패한 업데이트는 별도 섹션에 표시됩니다. 같은 저장소의 skill은 한 번만 가져오며, upstream에서 바뀌지 않은 skill은 그대로 두고 최신 상태로 표시합니다. 업데이트가 성공하면 해당 종류에 적용할 동기화 변경 사항이 있는지 확인합니다. **Sync Now**는 적용할 변경 사항이 있을 때만 표시되며, 없으면 동기화가 필요 없다고 안내합니다. 기존 symlink는 이미 갱신된 source 내용을 읽습니다. 동기화 확인에 실패하면 최신 상태라고 표시하는 대신 오류와 **Retry**를 표시합니다. 링크를 따라 발견한 Git 체크아웃은 링크 이름과 대상 경로가 있는 정보 행으로 표시됩니다. `skillshare update --all`처럼 이 탭에서는 확인, 업데이트 또는 강제 재시도를 하지 않습니다. 체크아웃을 직접 관리하거나 CLI에서 이름을 지정해 업데이트하세요.
`/collect`, `/install`, `/search`, `/trash`, `/analyze`, `/backup`, `/log`, `/doctor`와 같은 이전 링크는 새 위치로 리디렉션됩니다.
@@ -106,7 +106,7 @@ skillshare ui start --clear-cache
Git 冲突比较使用完整文件版本。可以逐个文件选择本机或远端,也能用 **全部保留本机**/**全部保留远端** 一次选择,再在应用前调整个别文件。选择已删除的一方会在合并中删除该文件。双方的提交历史都会保留;取消不会修改文件。
在 **Updates** 标签页中,进度条会显示更新进度,正在更新的行也会标记出来。被阻止或失败的更新会显示在单独的区域。更新成功后,标签页会检查该类型是否有待同步变更。只有有变更可应用时才会显示 **Sync Now**;没有差异时会提示无需同步。现有 symlink 已能读取更新后的 source 内容。同步检查失败时会显示错误与 **Retry**,不会误报全部为最新状态。 链接指向的 Git checkout 会以信息行显示链接名称和目标路径。与 `skillshare update --all` 一样,此标签页不会检查、更新或强制重试这些 checkout;请自行管理,或在 CLI 中按名称明确更新。
在 **Updates** 标签页中,进度条会显示更新进度,正在更新的行也会标记出来。被阻止或失败的更新会显示在单独的区域。同一仓库的 skill 只获取一次,在 upstream 中没有变化的 skill 保持不变,并显示为已是最新。更新成功后,标签页会检查该类型是否有待同步变更。只有有变更可应用时才会显示 **Sync Now**;没有差异时会提示无需同步。现有 symlink 已能读取更新后的 source 内容。同步检查失败时会显示错误与 **Retry**,不会误报全部为最新状态。 链接指向的 Git checkout 会以信息行显示链接名称和目标路径。与 `skillshare update --all` 一样,此标签页不会检查、更新或强制重试这些 checkout;请自行管理,或在 CLI 中按名称明确更新。
旧链接如 `/collect`、`/install`、`/search`、`/trash`、`/analyze`、`/backup`、`/log` 和 `/doctor` 会重定向到新位置。
@@ -106,7 +106,7 @@ skillshare ui start --clear-cache
Git 衝突比較使用完整檔案版本。可以逐個檔案選擇本機或遠端,也能用 **全部保留本機**/**全部保留遠端** 一次選擇,再於套用前調整個別檔案。選擇已刪除的一方會在合併中刪除該檔案。雙方的提交紀錄都會保留;取消不會修改檔案。
在 **Updates** 分頁中,進度列會顯示更新進度,正在更新的列也會標示出來。被阻擋或失敗的更新會顯示在獨立區塊。更新成功後,分頁會檢查該類型是否有待同步變更。只有有變更可套用時才會顯示 **Sync Now**;沒有差異時會提示無需同步。既有的 symlink 已能讀取更新後的 source 內容。同步檢查失敗時會顯示錯誤與 **Retry**,不會誤報全部為最新狀態。 連結指向的 Git checkout 會以資訊列顯示連結名稱和目標路徑。與 `skillshare update --all` 一樣,此分頁不會檢查、更新或強制重試這些 checkout;請自行管理,或在 CLI 中按名稱明確更新。
在 **Updates** 分頁中,進度列會顯示更新進度,正在更新的列也會標示出來。被阻擋或失敗的更新會顯示在獨立區塊。同一個儲存庫的 skill 只取得一次,在 upstream 沒有變更的 skill 維持不動,並顯示為已是最新版本。更新成功後,分頁會檢查該類型是否有待同步變更。只有有變更可套用時才會顯示 **Sync Now**;沒有差異時會提示無需同步。既有的 symlink 已能讀取更新後的 source 內容。同步檢查失敗時會顯示錯誤與 **Retry**,不會誤報全部為最新狀態。 連結指向的 Git checkout 會以資訊列顯示連結名稱和目標路徑。與 `skillshare update --all` 一樣,此分頁不會檢查、更新或強制重試這些 checkout;請自行管理,或在 CLI 中按名稱明確更新。
舊連結如 `/collect`、`/install`、`/search`、`/trash`、`/analyze`、`/backup`、`/log` 與 `/doctor` 會重新導向至新的位置。