fix(cli): remove duplicate skill catalog - #13210
Merged
Merged
Conversation
Contributor
Code Review SummaryStatus: No Issues Found | Recommendation: Merge Files Reviewed (4 files)
Reviewed by grok-4.6 · Input: 53.3K · Output: 10K · Cached: 424.8K Review guidance: REVIEW.md from base branch |
marius-kilocode
enabled auto-merge
August 18, 2026 15:09
johnnyeric
approved these changes
Aug 18, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The skill catalog was being emitted twice in ordinary agent requests: once in the system prompt and again in the dynamically generated
skilltool description. This repeated the same available-skill context on every request and increased prompt size without improving discoverability.This change keeps the system-prompt catalog as the single effective catalog. The
skilltool retains its static usage instructions and input schema, and invoking it still lazy-loads the complete skill body. The registry deletion is limited to the Kilo-specific dynamic description path, so permission filtering, project/global/builtin discovery, trusted skill handling, plugin definition hooks, and subagent behavior remain unchanged.Historical provenance: the removed
describeSkillblock was introduced by commitbfcb911648din PR #12204, the OpenCode v1.17.4 compatibility merge. That compatibility work added the concise skill inventory to the tool description, while the system-prompt catalog remained present. This PR removes only that later duplicate representation and preserves the surrounding upstream-compatible tool behavior.Validation included 50 skill, registry, discovery, permission, built-in, trust, worktree, system-prompt, and lazy-loading tests, plus CLI typecheck, lint, formatting, changeset, promise-facade, and OpenCode annotation guards.
The generated
/experimental/toolendpoint was measured before and after using deterministic JSON character counts. The endpoint continued to expose 17 tools, while total tool-definition JSON decreased from 41,583 to 35,706 characters. Theskilldescription decreased from 6,247 to 399 characters, and its catalog-marker count changed from 1 to 0. A live backend check returned the same corrected 399-character static description and unchanged schema for both a normal worktree and an Agent Manager-managed worktree.The persisted local session for this worktree also showed lower uncached model input after the fix. Comparing recorded
step-finishdata around the registry change, average uncached input fell from 7,268 to 2,502 tokens per step, a 65.6% reduction. Cache-read tokens naturally increased as the conversation grew, so they were not used as the prompt-size comparison.