Commit graph

14 commits

Author SHA1 Message Date
William Martin
f47e459cf5 Fix skills acceptance tests 2026-05-07 20:47:00 +02:00
William Martin
90ef03ea38
Enable telemetry without env var 2026-04-21 18:40:02 +01:00
William Martin
998b6212b3
Add skills specific telemetry
* Add skills specific telemetry

* Remove VisibilityFuture, inline goroutine at call sites

The VisibilityFuture/FetchRepoVisibilityAsync/Wait wrapper was an
unidiomatic async abstraction built for a single pattern used in
exactly two call sites. In Go the channel is already the future;
wrapping it in a struct with a Wait(timeout) method adds no value.

Delete the abstraction and inline a local visResult struct,
buffered channel, goroutine, and select at each call site. Behavior
is preserved exactly: err -> "unknown", timeout -> "unknown",
success+public -> include skill_names.

FetchRepoVisibility (synchronous) is kept as-is.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Fix nonsense copilot tests

* Update telemetry tests for public-only dims and search event removal

Production telemetry emission changed:
- preview: skill_owner/skill_repo/skill_name (renamed from skill_names)
  are now emitted only when repo_visibility=public.
- install: skill_owner/skill_repo/skill_names are now emitted only
  when repo_visibility=public.
- search: the initial skill_search event was removed entirely; the
  skill_search_install event no longer carries query/owner dims.

Update tests to match: rename skill_names -> skill_name in preview,
make owner/repo assertions conditional on public visibility in both
preview and install, and reduce the search test to a single event
with explicit Empty assertions for the removed query/owner dims so a
privacy regression cannot pass silently.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Test CategorizeHost and switch telemetry to skill_host_type

Add TestCategorizeHost covering all four classification branches
(github.com, ghes, tenancy, uncategorized) with cases verified
against the real ghauth implementation rather than guessed.

Update install and preview unit tests to assert the new
skill_host_type dimension name, and fix a typo in the preview
acceptance txtar (skill_hos_type -> skill_host_type).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Shrink visibility wait and test unknown visibility

The 2s visibilityWaitTimeout was wildly overprovisioned: by the time
telemetry emission reaches the select, the command has already done
several serial GitHub REST calls (and for install, a git sparse-checkout
plus possibly interactive prompts), so the one-call visibility fetch
has almost always completed. Drop the timeout to 200ms — a short safety
net for a stalled REST call, not a wait budget for a healthy one.

Also adds a table-driven case to TestFetchRepoVisibility covering an
unknown/future visibility value from the API, addressing @babakks'
review nitpick.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-04-17 19:58:59 +02:00
Sam Morrow
08a0c11d77
fix: update acceptance test to match current error message
The skills-publish-dry-run acceptance test expected 'no skills/ directory
found' on stderr, but the actual error message from discovery is
'no skills found in <dir>'. Update the stderr matcher accordingly.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-04-16 16:37:34 +02:00
Sam Morrow
963a1438a9
Merge pull request #13170 from cli/sammorrowdrums/fix-skills-namespace-dedup
fix: preserve namespace in skills search deduplication
2026-04-16 15:55:41 +02:00
Sam Morrow
980428c304
Merge pull request #13169 from cli/sammorrowdrums/fix-skills-publish-remote-detection 2026-04-16 01:17:06 +02:00
Sam Morrow
9552d225cc
Update acceptance/testdata/skills/skills-search-noresults.txtar
Co-authored-by: Kynan Ware <47394200+BagToad@users.noreply.github.com>
2026-04-16 00:35:39 +02:00
Sam Morrow
e04dceb3b5
fix: address review feedback on namespace changes
- Keep skillName as bare name in JSON output for backward compat;
  namespace is available as a separate --json field
- Fix Namespace field comment to cover plugin namespaces too
- Trim /SKILL.md from install path arg to match comment
- Rename acceptance test to skills-install-namespaced since it
  tests install disambiguation, not search

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-04-15 23:39:11 +02:00
Sam Morrow
92e40eabea
fix: preserve namespace in skills search deduplication
Skills with the same name but different namespaces (e.g.
skills/kynan/commit and skills/will/commit) were being collapsed
into a single search result because extractSkillName discarded the
namespace. This also caused deduplicateByName to cap results
across different namespaces as if they were the same skill.

Changes:
- Add MatchSkillPath to discovery package returning both name and
  namespace (the existing MatchesSkillPath is kept for compat)
- Add Namespace field to skillResult in search
- Fix deduplicateResults to use repo/namespace/name as the dedup key
- Fix deduplicateByName to cap by namespace-qualified name
- Update table, prompt, and JSON output to show qualified names
- Use skill path for install subprocess when namespace is present,
  ensuring unambiguous install of namespaced skills
- Add namespace to --json fields and relevance scoring/filtering
- Add unit tests for namespace dedup, qualified names, and filtering
- Add acceptance test for namespaced skill search and install

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-04-15 23:01:09 +02:00
Sam Morrow
1d5c74a838
fix: use target directory remotes in skills publish
When a directory argument is provided to `gh skill publish`, the remote
detection now correctly uses the target directory's git remotes instead
of the current working directory's remotes.

Previously, `detectGitHubRemote` used the factory-provided git client
which pointed to the CWD. This meant that running
`gh skill publish /path/to/repo-bar` from inside repo-foo would detect
repo-foo's remotes and potentially create the release on the wrong repo.

The fix copies the git client and sets `RepoDir` to the target directory,
matching the pattern already used by `detectMissingRepoDiagnostic` and
`checkInstalledSkillDirs`.

Co-authored-by: BagToad <47394200+BagToad@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-04-15 22:56:06 +02:00
tommaso-moro
45d0ec0b51
address review comments
Co-authored-by: Sam Morrow <info@sam-morrow.com>
2026-04-15 16:01:26 +02:00
Kynan Ware
8ea84d0dee
Expand test coverage and fix invariants/bugs
Cover the three primary discovery entry points with httpmock-based tests.
DiscoverSkills: happy path, truncated tree, no skills, API error, dedup.
DiscoverSkillByPath: path resolution, namespaces, invalid name, missing
directory, missing SKILL.md. DiscoverLocalSkills: convention matching,
root skill, no skills, nonexistent directory.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Test InstallLocal public API instead of private installLocalSkill

Replace tests that called installLocalSkill directly with tests through
InstallLocal. Adds coverage for AgentHost+Scope resolution path,
multiple skills, and missing Dir/AgentHost error. Fixes symlink test
to require.NoError on os.Symlink.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Test partial failure in concurrent Install

Add test where one of two skills fails (500 on tree fetch). Asserts
that result.Installed contains the successful skill and err wraps the
failed skill name. Fixes test loop to not clear Dir for partial failure
cases.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Refactor update tests to table-driven pattern

Consolidate 16 individual test functions into 3 standalone + 3 table
tests matching cli/cli conventions. Fix ArgsPassedToOptions to use
iostreams.Test() instead of os.Stdout/os.Stderr. Use GitHub-branded
test data. No coverage lost.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Add update execution test that verifies SKILL.md is rewritten

All prior update tests used DryRun or hit early exits. New test
exercises the full fetch-and-rewrite path: stale treeSHA triggers
re-download, SKILL.md is overwritten with new content and metadata.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Use heredoc.Doc for multiline SKILL.md strings in update tests

Replace escaped newline strings with heredoc.Doc backtick literals
for readability, matching cli/cli conventions.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Add interactive update path tests

Cover confirm-and-apply, confirm-cancelled, and no-metadata prompt
paths in TestUpdateRun. These interactive branches were previously
untested since all prior tests used non-TTY or DryRun.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Test no-metadata prompt enrichment through full update path

Add test where a skill with no GitHub metadata is prompted for origin,
user provides owner/repo, skill gets enriched and proceeds through
version resolution and file rewrite. Covers lines 222-224 in update.go.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Replace deprecated cs.Gray with cs.Muted

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Test namespaced skill update with --dir base resolution

Cover the filepath.Dir double-up path for namespaced skills (name
contains '/') when using --dir. Verifies the install base is resolved
correctly so the update writes to the right directory.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Test install failure during update reports error and preserves file

Cover the path where version resolution succeeds but blob fetch fails
during the actual install. Verifies stderr error message, SilentError
return, and that the original SKILL.md is not modified.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Dedupe resolveGitRoot/resolveHomeDir into installer, rename scanAllHosts

Move ResolveGitRoot and ResolveHomeDir to the installer package to
eliminate duplication between install and update commands. Fix
ResolveGitRoot to check RepoDir before calling ToplevelDir.

Rename scanAllHosts to scanAllAgents to match registry naming. Add
test exercising scanAllAgents via updateRun without --dir.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Use heredoc.Doc for multiline YAML strings across all test files

Convert 13 escaped-newline frontmatter strings to heredoc.Doc for
readability. Applies to discovery, frontmatter, install, update,
publish, and preview test files. Preserves edge-case test strings
and fmt.Sprintf interpolations as-is.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Use git.Client.Copy() instead of struct copy to avoid mutex copy

Fixes go vet 'copies lock value' warnings in publish command where
*git.Client was copied by value to set a different RepoDir. Rename
terse variable names (bc/ic/dc) to branchGit/ignoreGit/dirGit.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Rewrite publish tests: table-driven through publishRun

Consolidate 35 test functions into 2: TestNewCmdPublish (4 cases for
CLI arg parsing) and TestPublishRun (22 cases exercising all behavior
through the command's run function). No individual helper function
tests — every codepath tested through publishRun scenarios.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Remove .gitkeep from acceptance/testdata/skills

Delete the placeholder .gitkeep file from acceptance/testdata/skills. The directory no longer needs a placeholder file to be tracked in the repository.

Rename testPublishGitClient to newTestGitClient

Rename the test helper function testPublishGitClient to newTestGitClient in pkg/cmd/skills/publish/publish_test.go and update all call sites accordingly. This is a purely refactor/name-change with no behavioral changes to tests.

Fix Windows CI: set USERPROFILE alongside HOME in tests

os.UserHomeDir() uses USERPROFILE on Windows, not HOME. All tests
that redirect HOME for lockfile isolation now also set USERPROFILE
to the same temp directory.

Co-Authored-By: Copilot <223556219+Copilot@users.noreply.github.com>

Use range-over-int in acquireLock retry loop

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Test lock acquisition edge cases through RecordInstall

Make lockRetries and lockRetryInterval configurable (package-level vars)
so tests can avoid the 3s retry wait. Add two RecordInstall cases:
- Stale lock (>30s old) is broken and install succeeds
- Fresh lock exhausts retries, proceeds best-effort without lock

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Rename test helpers for lockfile tests

Rename setupHome to setupTestHome and readLockfile to readTestLockfile in internal/skills/lockfile tests, and update all call sites and comments accordingly. This is a refactor-only change to clarify test helper names with no behavior change.

Co-Authored-By: Copilot <223556219+Copilot@users.noreply.github.com>

Test read() degradation through RecordInstall, delete TestRead

Move corrupt JSON and wrong version cases into TestRecordInstall table.
RecordInstall calls read() internally, so these exercise the same
degradation paths through the public API. Verifies the lockfile is
rewritten with correct version and new data after recovery.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Fix InstalledAt preservation test to actually prove preservation

Move the update-preserves-InstalledAt case out of the table into a
standalone subtest that reads InstalledAt between two RecordInstall
calls and asserts exact equality. The table version only checked
NotEmpty which couldn't detect if InstalledAt was overwritten.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Merge duplicate plugin test into TestMatchSkillConventions table

The standalone TestDuplicatePluginSkills_DifferentAuthors re-implemented
dedup logic that belongs in DiscoverSkills. Replace with a table case
that tests convention matching only. Dedup is already covered by
TestDiscoverSkills.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Fix broken validateName max-length test case

Replace make([]byte, N) (which produces null bytes) with
strings.Repeat to actually test the 64-character boundary. Add
positive test for valid 64-char name.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Replace name-matching hack with createDir field in TestDiscoverLocalSkills

Use a struct field instead of comparing tt.name to control whether
the test directory is created. Prevents silent breakage if someone
renames the test case.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Improve collisions tests: table-driven FormatCollisions, exercise DisplayName

Convert TestFormatCollisions to table test with nil-input case. Update
single collision case to use different conventions (plugins vs skills)
so DisplayName() logic is actually exercised in the assertion.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Add tests for MatchesSkillPath, DiscoverSkillFiles, ListSkillFiles, FetchDescriptionsConcurrent

Also cover previously untested branches: root convention matching,
annotated tag dereference failure, empty tag_name/default_branch
fallbacks, recursive walkTree with subtrees, and skill directory
deduplication.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Test full GitHub key stripping in InjectLocalMetadata

Add all 7 github-* keys to the input metadata and assert all are
absent after injection. Previously only tested github-owner and
github-repo removal.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Test Serialize trailing-newline addition for body without newline

Add case where body doesn't end in newline and assert the output
has one appended. Previously this branch was uncovered.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Test InjectGitHubMetadata with no existing frontmatter

Add case where content has no --- delimiters, exercising the
RawYAML == nil branch that creates frontmatter from scratch.
Also fix test data to use GitHub-branded names.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Convert TestInjectLocalMetadata to table-driven with no-metadata case

Add case for content with no frontmatter, exercising the meta == nil
branch. Aligns with table-driven pattern used throughout.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Replace name-matching hack with useAgentHost field in TestInstallLocal

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Add tests for ResolveGitRoot

Cover RepoDir shortcut, nil client fallback, and empty RepoDir
fallback. Skip ResolveHomeDir — it's a thin os.UserHomeDir wrapper
with no logic to test.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Test OnProgress callback in both single and multi-skill Install paths

Cover the progress reporting branches in Install for both the
single-skill fast path (len==1) and the concurrent multi-skill path.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Cover missing InstallDir error branches and malformed URL in registry

Add user-scope-without-homeDir and invalid-scope cases to TestInstallDir.
Add malformed URL case to TestRepoNameFromRemote. Coverage 80.5% → 87.8%.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Rewrite install tests: table-driven through installRun and runLocalInstall

Consolidate 48 individual test functions into 6: TestNewCmdInstall (10
cases for CLI parsing), TestInstallRun (21 cases for remote install
flow), TestRunLocalInstall (10 cases for local install flow), plus
TestIsLocalPath, TestIsSkillPath, TestFriendlyDir for pure input
classification. Delete zero-value Help test. All behavior tested
through public functions instead of calling internal helpers directly.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Fix data race in OnProgress test with atomic counter

The OnProgress callback was appending to a shared slice from concurrent
goroutines. Replace with sync/atomic counter to avoid the race.

Co-Authored-By: Copilot <223556219+Copilot@users.noreply.github.com>

Add interactive install tests for skill selection, scope, host, and overwrite

Exercise the interactive TTY paths in installRun: MultiSelectWithSearch
for skill selection, Select for scope prompt, MultiSelect for host
selection, and Confirm for overwrite declined.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Exercise skillSearchFunc fully through interactive mock

Update the interactive skill selection test to use 31 skills (exceeding
maxSearchResults cap), include a skill without a description, and have
the mock call searchFunc with both empty and filtered queries. Verifies
the MoreResults count, label formatting, and truncation branches.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Fill remaining install coverage gaps

Add local path detection cases to TestNewCmdInstall. Add interactive
repo prompt, user scope selection, overwrite without metadata, and
single exact match cases to TestInstallRun. Add bare tilde expansion
to TestRunLocalInstall.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Move HOME/USERPROFILE setenv to test loops, remove per-case duplication

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Add isTTY field to install test tables, centralize TTY setup

Move TTY configuration from individual opts funcs into the test loops.
Each table case declares isTTY: true/false and the loop sets all three
streams accordingly.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Remove INSTALL_TARGET env var hack from install test

Metadata injection is already proven by installer package tests.
This test only needs to verify installRun orchestrates correctly.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Add ScopeChanged: true to all install tests with explicit Scope

Ensures tests simulate the same state cobra produces when --scope is
explicitly provided, preventing silent codepath divergence if the
default scope behavior changes.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Fix assert.Error → require.Error in TestNewCmdSearch

Prevents nil panic on err.Error() if the command unexpectedly returns nil.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Improve preview test quality and coverage

- Fix assert.Error/assert.NoError → require.Error/require.NoError to
  prevent nil panics in TestNewCmdPreview and TestPreviewRun
- Add renderAllFiles edge case tests: maxFiles cap (20 files), maxBytes
  cap (512KB), and FetchBlob error fallback message
- Replace custom discardWriter with io.Discard
- Use GitHub-branded names (monalisa) in new tests

Co-Authored-By: Copilot <223556219+Copilot@users.noreply.github.com>

Add search test coverage: rate limits, owner scope, blob enrichment

- Add HTTP 429 and 403+Retry-After rate limit test cases
- Add owner-scoped no-results test (exercises noResultsMessage branch)
- Add blob description enrichment test (exercises fetchDescriptions path)
- Replace custom splitOnSpaces with strings.Fields
- Replace custom discardWriter with io.Discard

Co-Authored-By: Copilot <223556219+Copilot@users.noreply.github.com>

Remove low-value alias test for preview command

The test only asserts a string literal matches another string literal.
Alias presence is already visible in the command definition.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Replace local pluralize with text.Pluralize

The internal/text package already provides this function via go-gh.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Inline collapseWhitespace — just strings.Fields + Join

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Doc: suggest using go-humanize for star formatting

Co-Authored-By: Copilot <223556219+Copilot@users.noreply.github.com>

Return cmdutil.CancelError on user cancellation in publish and update

Both commands returned nil (success exit) when the user declined
confirmation. The core CLI pattern is to return CancelError so the
process exits with a non-zero status.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Add interactive publish prompt tests and isTTY field

Cover all prompt branches in runPublishRelease:
- Topic confirm + semver tag selection + final confirm (happy path)
- Custom tag input path (select idx=1)
- Final confirm declined (CancelError)
- Immutable releases prompt (enable via PATCH)

Add isTTY field to test table struct for centralized TTY setup,
matching the pattern used in install tests. Add auto-confirm
prompters to existing TTY tests that now need them.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Remove duplicate giturl import alias in publish

The git package was imported twice — once as 'git' and again as
'giturl'. Use git.ParseURL directly.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Fix data race in search enrichment

fetchDescriptions and fetchRepoStars run concurrently but both wrote
to fields of the same skillResult slice elements, triggering the race
detector. Refactor both functions to return index-keyed maps instead
of mutating the slice directly. enrichSkills merges the maps into the
slice after both goroutines complete.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

refactor: remove Claude plugin branding, align with Open Plugin Spec

Replace all 'Claude plugin' references with generic 'plugin' terminology
to align with the vendor-neutral Open Plugin Spec
(https://github.com/vercel-labs/open-plugin-spec).

Changes:
- Rename .claude-plugin/ to .plugin/ (spec §5.1 vendor-neutral manifest)
- Rename claudePluginJSON/claudeAuthor types to pluginJSON/pluginAuthor
- Rename claudeMarketplaceJSON to marketplaceJSON
- Rename generateClaudePlugin to generatePlugin
- Remove 'Claude Code' from plugin-related comments, help text, and flags
- Update install.go plugins/ convention message

Factual host references (Claude Code as an agent name, .claude/skills
directories) are intentionally preserved — those are product names, not
plugin branding.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Remove --plugins flag from publish command

Remove the --plugins flag and all associated plugin generation code from
the publish flow. This was scope creep — the publish command should focus
on validating and publishing skills, not generating plugin
manifests.

Removed:
- --plugins flag and Plugins option field
- generatePlugin, generateMarketplace, buildPluginDescription functions
- pluginJSON, marketplaceJSON, marketplacePlugin types
- Related tests and help text

The install command's ability to discover and pluck skills from plugin-
structured repositories (plugins/ convention) is preserved.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

don't fall back on default branch if you can't fetch latest release

improve search algo by using square rot instead of log for stars, and reduce weight for exact name match

add support for --unpin flag when updating a skill
2026-04-15 15:46:58 +02:00
tommaso-moro
40b2a784e3
add core logic and improve test coverage 2026-04-15 15:45:49 +02:00
tommaso-moro
758785b8f4
improve test coverage/cleanup 2026-04-15 15:45:29 +02:00