fix(ponytail): E0593 compile error + restore AGENTS.md fallback lost in #90 - #93
Merged
Conversation
📝 WalkthroughWalkthroughThe ChangesClosure Signature Fix
Estimated code review effort: 1 (Trivial) | ~2 minutes Possibly related PRs
🚥 Pre-merge checks | ✅ 3 | ❌ 2❌ Failed checks (2 warnings)
✅ Passed checks (3 passed)
✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Comment |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
What
Two fixes for regressions introduced by #90 (e8c33df):
E0593 compile error breaking master CI:
instructions.rschainedOption::or_else(...).unwrap_or_else(|_| ...)—Option::unwrap_or_elsetakes a zero-argument closure. Fixed|_|→||. Every PR inherited this via the merge ref (e.g. feat: skill registry MCP — skill_search + skill_load #92).AGENTS.md workspace fallback silently dropped: feat(ponytail): custom skills system + mode shortcuts #90's rewrite of the skill-body chain removed the
find_workspace_agents_md()step that feat(ponytail): AGENTS.md fallback + persona hardening + anti-hallucination #81 added (the leftover|_|closure was a fossil of the old Result chain — evidence the removal was accidental, and feat(ponytail): custom skills system + mode shortcuts #90's description only claims 'checks custom skills before embedded fallback'). Rewired in the new priority order: custom skill → cache → workspace AGENTS.md → embedded. This also removes the dead-code warning.Verified
cargo build -p ponytailzero warnings;cargo test -p ponytail33/33 passing.Note for maintainers
The required
cargo auditstatus is path-filtered toCargo.toml/Cargo.lockand never reports on PRs that don't touch them (like this one), so branch protection blocks the merge despite all runnable checks being green — needs an admin merge or a workflow/protection tweak.Summary by CodeRabbit