Skip to content

Integrate skill discovery fixes / 集成技能发现修复#4510

Merged
esengine merged 2 commits into
esengine:main-v2from
SivanCola:fix/skill-discovery-overlap
Jun 16, 2026
Merged

Integrate skill discovery fixes / 集成技能发现修复#4510
esengine merged 2 commits into
esengine:main-v2from
SivanCola:fix/skill-discovery-overlap

Conversation

@SivanCola

Copy link
Copy Markdown
Collaborator

Summary

Fixes #4417.

Related PRs

Authorship note: @SivanCola is the maintainer integrator for this PR. @thomasvan and @ferstar contributed as repository collaborators through #4441 and #4442; their work is acknowledged as part of the shared skill-discovery fix.

Cache impact

  • Skill discovery becomes less noisy for .claude/skills flat Markdown and more complete for linked skill directories.
  • No per-turn dynamic skill metadata, tool schemas, provider serialization, or prompt construction order changes were introduced beyond deterministic discovery of intended skill files.

Verification

  • go test ./internal/skill ./internal/config
  • go test ./internal/boot with isolated HOME and XDG_CONFIG_HOME
  • go test -run 'TestSkillRootsView|TestCapabilitiesIncludesDisabledSkills|TestNormalizeSkillPath' . from desktop/
  • git diff --check

go test ./... was also attempted with isolated HOME and XDG_CONFIG_HOME; only sandbox confinement tests failed because this local runner does not enforce the expected sandbox denial behavior.

@SivanCola SivanCola requested a review from esengine as a code owner June 15, 2026 10:07
@github-actions github-actions Bot added skills Skill system (internal/skill, internal/tool) v2 Go rewrite (1.x) — main-v2 branch, active development labels Jun 15, 2026
@SivanCola

Copy link
Copy Markdown
Collaborator Author

Contribution note: thanks @thomasvan and @ferstar for the overlapping skill-discovery work in #4441 and #4442.

This integration PR preserves @thomasvan's Claude flat-Markdown warning fix and tests, and @ferstar's Windows linked skill directory fix and tests. @SivanCola is acting as maintainer integrator here; @thomasvan and @ferstar are acknowledged as repository contributors to this shared fix.

@SivanCola

Copy link
Copy Markdown
Collaborator Author

@codex review

@SivanCola SivanCola enabled auto-merge June 15, 2026 10:11
@SivanCola SivanCola disabled auto-merge June 15, 2026 10:11
@SivanCola SivanCola enabled auto-merge June 15, 2026 10:11
@SivanCola SivanCola disabled auto-merge June 15, 2026 10:12
@SivanCola SivanCola force-pushed the fix/skill-discovery-overlap branch from e4785ef to f3742f1 Compare June 15, 2026 10:13
@SivanCola

Copy link
Copy Markdown
Collaborator Author

Status update: the refreshed clean head f3742f1e passed the full GitHub check set. Normal merge is still blocked by the branch review policy, so I am leaving this open for review rather than using admin bypass or a personal email for auto-merge.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e4785ef5a6

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread internal/skill/skill.go Outdated
@SivanCola SivanCola enabled auto-merge June 15, 2026 10:20
@esengine esengine merged commit 2f974ef into esengine:main-v2 Jun 16, 2026
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skills Skill system (internal/skill, internal/tool) v2 Go rewrite (1.x) — main-v2 branch, active development

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: skill 扫描无法扫描到软连接

2 participants