Skip to content

fix(ponytail): E0593 compile error + restore AGENTS.md fallback lost in #90 - #93

Merged
getappz merged 2 commits into
masterfrom
fix/ponytail-option-unwrap
Jul 8, 2026
Merged

fix(ponytail): E0593 compile error + restore AGENTS.md fallback lost in #90#93
getappz merged 2 commits into
masterfrom
fix/ponytail-option-unwrap

Conversation

@getappz

@getappz getappz commented Jul 8, 2026

Copy link
Copy Markdown
Owner

What

Two fixes for regressions introduced by #90 (e8c33df):

  1. E0593 compile error breaking master CI: instructions.rs chained Option::or_else(...).unwrap_or_else(|_| ...)Option::unwrap_or_else takes a zero-argument closure. Fixed |_|||. Every PR inherited this via the merge ref (e.g. feat: skill registry MCP — skill_search + skill_load #92).

  2. 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 ponytail zero warnings; cargo test -p ponytail 33/33 passing.

Note for maintainers

The required cargo audit status is path-filtered to Cargo.toml/Cargo.lock and 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

  • Refactor
    • Made a minor internal adjustment to the cached skill loading fallback logic.
    • No user-facing behavior, output, or flow was changed.

@coderabbitai

coderabbitai Bot commented Jul 8, 2026

Copy link
Copy Markdown

Review Change Stack

📝 Walkthrough

Walkthrough

The build function in crates/ponytail/src/instructions.rs now uses a zero-argument unwrap_or_else fallback closure instead of one that accepted an unused parameter. The fallback string and control flow are unchanged.

Changes

Closure Signature Fix

Layer / File(s) Summary
Fallback closure signature update
crates/ponytail/src/instructions.rs
Changed the unwrap_or_else fallback closure in build from `

Estimated code review effort: 1 (Trivial) | ~2 minutes

Possibly related PRs

  • getappz/agentflare#81: Modifies the same build() fallback flow for cached skill loading in instructions.rs.
🚥 Pre-merge checks | ✅ 3 | ❌ 2

❌ Failed checks (2 warnings)

Check name Status Explanation Resolution
Title check ⚠️ Warning The title mentions the E0593 fix, but also claims an AGENTS.md fallback restore that is not reflected in the changeset. Remove the AGENTS.md fallback claim and keep the title focused on the compile fix, or include that fallback change in the PR.
Description check ⚠️ Warning The description covers the change and verification, but it does not follow the required template sections or include the test plan and reviewer notes. Rewrite it using the template headings: Summary, Test plan with checkboxes, and Notes for reviewers with risk areas and backward compatibility.
✅ Passed checks (3 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/ponytail-option-unwrap

Comment @coderabbitai help to get the list of available commands.

@getappz getappz changed the title fix(ponytail): E0593 compile error on master from #90 fix(ponytail): E0593 compile error + restore AGENTS.md fallback lost in #90 Jul 8, 2026
@getappz
getappz merged commit 07d7ed1 into master Jul 8, 2026
8 checks passed
@getappz
getappz deleted the fix/ponytail-option-unwrap branch July 8, 2026 05:23
@github-actions github-actions Bot locked and limited conversation to collaborators Jul 8, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant