fix(skill): add conflict detection to github-pr#74
Merged
yishuiliunian merged 2 commits intomainfrom Apr 4, 2026
Merged
Conversation
…pt quality improvements Sub-agent prompts were crippled: agent_type never reached PromptContext, so agent-specific fragments (explore, plan) never matched. Tool schemas were also duplicated in both the system prompt and the API tools parameter. Changes: - Thread agent_type through the full IPC spawn pipeline (6 crates) - Add Condition::Agent variant so fragments can target specific agent types - Registry excludes Agents category for root agent; falls back to default fragment for unknown types; uses specific fragment when matched - Remove redundant tool schema section from system prompt (saves ~3-5K tokens) - Reorder assembly: fragments (identity-first) → instructions → skills → memory - Enhance explore/plan/default-subagent prompt content with behavioral constraints, search strategies, and structured output formats - Remove dead build_agent_prompt() superseded by fragment selection - Derive is_subagent() from agent_type.is_some() instead of separate field
…hub-pr The github-pr skill failed silently when PR had merge conflicts (CI never triggered) and when merging from a worktree (gh pr merge can't checkout main). Add Phase 2.5 for conflict detection with cherry-pick and rebase resolution strategies, plus gh api fallback for merging.
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
1 participant
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.
Summary
mergeablestatus immediately after PR creationgh apifallback for merging in worktree environments wheregh pr mergefailsgit fetch,git rebase,git cherry-pick,bazel,rustfmtTest plan