Files
Willie cfe235a84d fix(install): report reinstalls from the same repo as skipped (#887)
* fix(install): report reinstalls from the same repo as skipped

checkExistingConflict read only the legacy .skillshare-meta.json
sidecar, which installs no longer write, so reinstalling a skill from
the same repo was reported as "already exists" and counted as failed,
contrary to the documented skip. It now reads the skill's record in
.metadata.json, falling back to the sidecar, and skips only the same
skill of that repo: another skill installed under the same name stays
a conflict instead of being reported as installed.

The dashboard logged an existing agent as installed and a same-repo
skill as failed. Batch installs now return those as skipped and log
them as skipped_skills, passing --into so a reinstall into a group
folder finds its record; the install dialog warns that they are
already installed. A same-repo tracked reinstall returns 409 and is
logged as skipped instead of a 500 logged as failed.

ss search installs, batch and single, log the names they skip, and
the Herdr panel reports skipped names like failed ones. The install
docs and their translations say that only the same skill is skipped.

* fix(install): install requested agents when the only skill is skipped

Reinstalling a single-skill repo with `-s alpha -a helper` returned as
soon as the skill was skipped as already installed, so the requested
agent was never installed while the command reported success. Both
single-skill branches now continue to the agent phase, as the
multi-skill path already does.
2026-11-14 00:03:17 +08:00

377 lines
14 KiB
Go

package install
import (
"errors"
"fmt"
"log/slog"
"os"
"strings"
"skillshare/internal/sourcewalk"
)
// InstallOptions configures the install behavior
type InstallOptions struct {
Name string // Override skill name
Kind string // "skill", "agent", or "" (auto-detect)
Force bool // Overwrite existing
DryRun bool // Preview only
Update bool // Update existing installation
Track bool // Install as tracked repository (preserves .git)
OnProgress ProgressCallback
Skills []string // Select specific skills from multi-skill repo (comma-separated)
AgentNames []string // Select specific agents from repo (comma-separated)
Exclude []string // Skills to exclude from installation (comma-separated)
All bool // Install all discovered skills without prompting
Yes bool // Auto-accept all prompts (equivalent to --all for multi-skill repos)
Into string // Install into subdirectory (e.g. "frontend" or "frontend/react")
SkipAudit bool // Skip security audit entirely
AuditVerbose bool // Print full audit findings in CLI output (default is compact summary)
AuditThreshold string // Block threshold: CRITICAL/HIGH/MEDIUM/LOW/INFO
AuditProjectRoot string // Project root for project-mode audit rule resolution
Quiet bool // Suppress per-skill output in InstallFromConfig
Branch string // Git branch to clone from (empty = remote default)
SourceDir string // Skills root dir for centralized metadata (set by caller)
Lock *Lock // Pinned commits for InstallFromConfig (project mode); nil = follow the branch
ParseOptions ParseOptions // Explicit credential host policy for existing checkouts
// AuditOverride lets an install proceed despite audit findings at/above the
// block threshold. Deliberately separate from Force, which only means
// "overwrite what is already there" and is set unconditionally by updates
// — routing the audit gate through Force would disable it there.
AuditOverride bool
// Reinstall makes a batch update copy every skill again even when its
// recorded commit or tree hash already matches upstream (update --force).
// A git-installed skill is reset to upstream instead of pulled, discarding
// local edits.
Reinstall bool
// AuditAcceptRoot/AuditAcceptPath override where accepted audit findings
// are looked up and recorded. Staged installs audit a temp directory, so
// they point these at the final destination to keep metadata keys stable.
AuditAcceptRoot string
AuditAcceptPath string
// skillFileOnly makes a local install copy only SKILL.md. Updates set it
// to keep the shape of a collection root installed that way.
skillFileOnly bool
// SourceFollow is the operation's follow policy for SourceDir, so writes
// pass through followed first-level links; nil follows none.
SourceFollow *sourcewalk.Follow
}
// auditAcceptTarget returns the (sourceDir, path) pair used to key accepted
// audit findings for an install landing at path.
func (o InstallOptions) auditAcceptTarget(path string) (string, string) {
if o.AuditAcceptPath != "" {
return o.AuditAcceptRoot, o.AuditAcceptPath
}
return o.SourceDir, path
}
// IsAgentMode returns true if explicitly installing agents.
func (o InstallOptions) IsAgentMode() bool { return o.Kind == "agent" }
// HasAgentFilter returns true if specific agents were requested via -a flag.
func (o InstallOptions) HasAgentFilter() bool { return len(o.AgentNames) > 0 }
// ShouldInstallAll returns true if all discovered skills should be installed without prompting.
func (o InstallOptions) ShouldInstallAll() bool { return o.All || o.Yes }
// HasSkillFilter returns true if specific skills were requested via --skill flag.
func (o InstallOptions) HasSkillFilter() bool { return len(o.Skills) > 0 }
// InstallResult reports the outcome of an installation
type InstallResult struct {
SkillName string
SkillPath string
Source string
Action string // "cloned", "copied", "updated", "skipped"
Warnings []string
AuditThreshold string
AuditRiskScore int
AuditRiskLabel string
AuditSkipped bool
}
// SkillInfo represents a discovered skill in a repository
type SkillInfo struct {
Name string // Install name (directory name, or frontmatter for generic containers)
Path string // Relative path from repo root
License string // License from SKILL.md frontmatter (if any)
Description string // Description from SKILL.md frontmatter (if any)
}
// AgentInfo represents a discovered agent (.md file) in a repository
type AgentInfo struct {
Name string // Agent name (filename without .md)
Path string // Relative path from repo root (e.g. "agents/tutor.md")
FileName string // Filename (e.g. "tutor.md")
}
// DiscoveryResult contains discovered skills and agents from a repository
type DiscoveryResult struct {
RepoPath string // Temp directory where repo was cloned
Skills []SkillInfo // Discovered skills
Agents []AgentInfo // Discovered agents
Source *Source // Original source
CommitHash string // Source commit hash when available
Warnings []string // Non-fatal warnings during discovery
}
// HasAgents reports whether the discovery found any agents.
func (d *DiscoveryResult) HasAgents() bool {
return len(d.Agents) > 0
}
// HasSkills reports whether the discovery found any skills.
func (d *DiscoveryResult) HasSkills() bool {
return len(d.Skills) > 0
}
// IsMixed reports whether the discovery found both skills and agents.
func (d *DiscoveryResult) IsMixed() bool {
return d.HasSkills() && d.HasAgents()
}
// TrackedRepoResult reports the outcome of a tracked repo installation
type TrackedRepoResult struct {
RepoName string // Name of the tracked repo (e.g., "_team-skills")
RepoPath string // Full path to the repo
SkillCount int // Number of skills discovered
Skills []string // Names of discovered skills
AgentCount int // Number of agents discovered
Agents []string // Names of discovered agents
Action string // "cloned", "updated", "skipped"
Warnings []string
AuditThreshold string
AuditRiskScore int
AuditRiskLabel string
AuditSkipped bool
}
// ErrSkipSameRepo is returned when the destination skill already exists and
// was installed from the same repository. Callers should treat this as a
// friendly skip, not a hard failure.
var ErrSkipSameRepo = errors.New("already installed from same repo")
// checkExistingConflict compares the repo_url and subdir recorded for an
// existing skill with the incoming source. recorded is the skill's entry in
// the source's .metadata.json, or nil; skills installed before that store
// existed keep a sidecar meta file instead. Returns:
// - nil when the directory is empty/invalid (caller should overwrite)
// - ErrSkipSameRepo when it is the same skill of the same repo (caller should skip gracefully)
// - a descriptive error otherwise, or when no record is found (real conflict)
func checkExistingConflict(destPath string, recorded *MetadataEntry, incomingCloneURL, incomingSubdir, forceHint string) error {
repoURL, subdir := "", ""
if recorded != nil {
repoURL, subdir = recorded.RepoURL, recorded.Subdir
}
if repoURL == "" {
if meta, err := ReadMeta(destPath); err == nil && meta != nil {
repoURL, subdir = meta.RepoURL, meta.Subdir
}
}
if repoURL == "" {
// No record — check if directory is truly empty.
if dirIsEmpty(destPath) {
return nil
}
// Non-empty directory without a record — unknown origin.
return fmt.Errorf("already exists. To overwrite: %s", forceHint)
}
if repoURLsMatch(repoURL, incomingCloneURL) && subdir == incomingSubdir {
return fmt.Errorf("%w: use 'skillshare update' or --force to overwrite", ErrSkipSameRepo)
}
// Another repo, or another skill of it — real conflict with provenance info.
return fmt.Errorf("already exists (installed from %s). To overwrite: %s", repoURL, forceHint)
}
// dirIsEmpty returns true if the directory has no entries (or only OS junk
// like .DS_Store). Returns false for non-directories or read errors.
func dirIsEmpty(path string) bool {
entries, err := os.ReadDir(path)
if err != nil {
return false
}
for _, e := range entries {
if e.Name() == ".DS_Store" {
continue
}
return false
}
return true
}
// repoURLsMatch compares two clone URLs, normalizing trailing ".git" and
// protocol differences (https vs git@). Returns false when either URL is empty.
func repoURLsMatch(a, b string) bool {
na, nb := normalizeCloneURL(a), normalizeCloneURL(b)
return na != "" && nb != "" && na == nb
}
func normalizeCloneURL(u string) string {
u = strings.TrimSpace(u)
u = strings.TrimSuffix(u, ".git")
u = strings.TrimSuffix(u, "/")
// user@github.com:owner/repo → github.com/owner/repo
if at := strings.Index(u, "@"); at > 0 && !strings.Contains(u, "://") {
u = u[at+1:]
u = strings.Replace(u, ":", "/", 1)
}
// https://github.com/owner/repo → github.com/owner/repo
u = strings.TrimPrefix(u, "https://")
u = strings.TrimPrefix(u, "http://")
return strings.ToLower(u)
}
// buildForceHint constructs a user-facing hint like
// "skillshare install <source> --into <dir> --force".
func buildForceHint(rawSource, into string) string {
cmd := "skillshare install " + rawSource
if into != "" {
cmd += " --into " + into
}
cmd += " --force"
return cmd
}
// removeAll is a test hook used by audit/install paths.
var removeAll = os.RemoveAll
var removeTempRepoPath = os.RemoveAll
func cleanupTempRepo(path string) {
if path == "" {
return
}
if err := removeTempRepoPath(path); err != nil {
slog.Warn("failed to clean up temp repo", "path", path, "error", err)
}
}
// Install executes the installation from source to destination.
// This file is intentionally a thin facade; implementation lives in split files.
func Install(source *Source, destPath string, opts InstallOptions) (*InstallResult, error) {
return installImpl(source, destPath, opts)
}
// DiscoverFromGit clones a repository and discovers skills inside it.
func DiscoverFromGit(source *Source) (*DiscoveryResult, error) {
return discoverFromGitImpl(source)
}
// DiscoverFromGitWithProgress clones a repository and discovers skills inside it
// while optionally streaming git progress output.
func DiscoverFromGitWithProgress(source *Source, onProgress ProgressCallback) (*DiscoveryResult, error) {
return discoverFromGitWithProgressImpl(source, onProgress)
}
// DiscoverFromGitSubdir clones a repository and discovers skills in the source subdir.
func DiscoverFromGitSubdir(source *Source) (*DiscoveryResult, error) {
return discoverFromGitSubdirImpl(source)
}
// DiscoverFromGitSubdirWithProgress clones a repository and discovers skills in
// the source subdir while optionally streaming git progress output.
func DiscoverFromGitSubdirWithProgress(source *Source, onProgress ProgressCallback) (*DiscoveryResult, error) {
return discoverFromGitSubdirWithProgressImpl(source, onProgress)
}
// TrackKindAmbiguousError is returned by InferTrackedKind when a tracked
// install targets a repository that contains both skills and agents and the
// caller did not pass an explicit kind. It carries the discovered counts so
// the UI can present a kind picker without re-cloning.
type TrackKindAmbiguousError struct {
Skills int
Agents int
}
func (e *TrackKindAmbiguousError) Error() string {
return "tracked install is ambiguous for mixed repositories; pass --kind skill or --kind agent"
}
// InferTrackedKind determines which resource kind a tracked install should use.
// Pure-agent repositories resolve to "agent". Mixed repositories must specify
// the kind explicitly to avoid ambiguous install roots; in that case the
// returned error is a *TrackKindAmbiguousError carrying the discovered counts.
func InferTrackedKind(source *Source, explicitKind string) (string, error) {
if err := normalizeTrackSource(source); err != nil {
return "", err
}
if explicitKind == "skill" || explicitKind == "agent" {
return explicitKind, nil
}
var (
discovery *DiscoveryResult
err error
)
if source.HasSubdir() {
discovery, err = DiscoverFromGitSubdir(source)
} else {
discovery, err = DiscoverFromGit(source)
}
if err != nil {
return "", err
}
defer CleanupDiscovery(discovery)
switch {
case discovery.HasSkills() && discovery.HasAgents():
return "", &TrackKindAmbiguousError{
Skills: len(discovery.Skills),
Agents: len(discovery.Agents),
}
case discovery.HasAgents() && !discovery.HasSkills():
return "agent", nil
default:
return "skill", nil
}
}
// DiscoverLocal inspects a local directory and discovers skills and agents.
func DiscoverLocal(source *Source) (*DiscoveryResult, error) {
return discoverLocalImpl(source)
}
// CleanupDiscovery removes temporary resources created by discovery.
func CleanupDiscovery(result *DiscoveryResult) {
cleanupDiscoveryImpl(result)
}
// InstallFromDiscovery installs one selected skill from a discovery result.
func InstallFromDiscovery(discovery *DiscoveryResult, skill SkillInfo, destPath string, opts InstallOptions) (*InstallResult, error) {
return installFromDiscoveryImpl(discovery, skill, destPath, opts)
}
// InstallTrackedRepo clones a git repository as a tracked repo.
func InstallTrackedRepo(source *Source, sourceDir string, opts InstallOptions) (*TrackedRepoResult, error) {
return installTrackedRepoImpl(source, sourceDir, opts)
}
// GetUpdatableSkills returns skill names that have metadata with a remote source.
func GetUpdatableSkills(sourceDir string) ([]string, error) {
return getUpdatableSkillsImpl(sourceDir)
}
// GetTrackedRepos returns tracked repositories in the source directory as
// slash paths relative to it (org/_team), on every OS. An optional walk policy
// follows first-level source links; omitted, none are.
func GetTrackedRepos(sourceDir string, walk ...sourcewalk.Options) ([]string, error) {
var opts sourcewalk.Options
if len(walk) > 0 {
opts = walk[0]
}
return getTrackedReposImpl(sourceDir, opts)
}
// GetMissingTrackedRepos returns tracked metadata entries whose repo clone is absent.
// An optional walk policy recognizes existing followed source checkouts.
func GetMissingTrackedRepos(sourceDir string, walks ...sourcewalk.Options) ([]TrackedRepoMeta, error) {
return getMissingTrackedReposImpl(sourceDir, walks...)
}