mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-19 02:17:09 +00:00
Make the v0.19.16 sources map actually do something: route all path reads through Config.EffectiveSkillsSource() / EffectiveAgentsSource() / EffectiveExtrasSource() so users who set sources.skills / sources.agents / sources.extras get the configured paths everywhere. Mechanical changes (~50 files): - cmd/skillshare/**: replace cfg.Source / cfg.ExtrasSource reads with cfg.EffectiveSkillsSource() / cfg.EffectiveExtrasSource() - internal/server/**: replace s.cfg.Source / s.cfg.ExtrasSource reads with the same helpers; server.skillsSource() / gitignoreDir() use the global-mode helper - internal/config/config_validate.go: validate using EffectiveSkillsSource while still rejecting configs that set neither field explicitly - internal/config/reconcile.go, registry.go: read via helpers Behavioral fixes (paired with the migration): - extras init / extras source / POST /api/extras no longer silently backfill the legacy extras_source field — the runtime fallback inside EffectiveExtrasSource() handles it. This stops surprise diffs in users' config.yaml after running extras commands. - extras source command writes back to whichever field the user already configured (sources.extras if set, otherwise legacy extras_source) so the update is not shadowed. - source_type in /api/extras and extras list correctly reports "default" vs "extras_source" by inspecting the raw (unresolved) configured value; sources.extras counts as configured for this purpose. UI: - ui/src/lib/fieldDocs.ts: neutralize sources / sources.* descriptions so they describe both project and global modes (Phase 5). Preserved (intentional): - Direct writes to cfg.Source / cfg.AgentsSource / cfg.ExtrasSource in init, migrate.go, cloneForSave, and server.reloadConfig — these are raw-field writes, not path reads. - Updated test expectations for the removed backfills.
57 lines
1.5 KiB
Go
57 lines
1.5 KiB
Go
package server
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"skillshare/internal/config"
|
|
versioncheck "skillshare/internal/version"
|
|
)
|
|
|
|
func (s *Server) handleVersionCheck(w http.ResponseWriter, r *http.Request) {
|
|
// Snapshot config under RLock, then release before I/O.
|
|
s.mu.RLock()
|
|
source := s.cfg.EffectiveSkillsSource()
|
|
projectRoot := s.projectRoot
|
|
s.mu.RUnlock()
|
|
|
|
isProjectMode := projectRoot != ""
|
|
|
|
cliVersion := versioncheck.Version
|
|
cliUpdateAvailable := false
|
|
var cliLatest *string
|
|
|
|
// CLI version check (uses 24h cache)
|
|
if result := versioncheck.Check(cliVersion, versioncheck.InstallDirect); result != nil {
|
|
cliUpdateAvailable = result.UpdateAvailable
|
|
cliLatest = &result.LatestVersion
|
|
}
|
|
|
|
// Skill version (local) — always check global source for built-in skill
|
|
skillSourceDir := source
|
|
if isProjectMode {
|
|
if globalCfg, err := config.Load(); err == nil {
|
|
skillSourceDir = globalCfg.Source
|
|
}
|
|
}
|
|
skillVersion := versioncheck.ReadLocalSkillVersion(skillSourceDir)
|
|
|
|
// Skill version (remote) — network call with 3s timeout
|
|
var skillLatest *string
|
|
skillUpdateAvailable := false
|
|
if skillVersion != "" {
|
|
if remote := versioncheck.FetchRemoteSkillVersion(); remote != "" {
|
|
skillLatest = &remote
|
|
skillUpdateAvailable = remote != skillVersion
|
|
}
|
|
}
|
|
|
|
writeJSON(w, map[string]any{
|
|
"cliVersion": cliVersion,
|
|
"cliLatest": cliLatest,
|
|
"cliUpdateAvailable": cliUpdateAvailable,
|
|
"skillVersion": skillVersion,
|
|
"skillLatest": skillLatest,
|
|
"skillUpdateAvailable": skillUpdateAvailable,
|
|
})
|
|
}
|