--- name: flutter-cherry-pick description: How to land a formal cherry-pick of a merged PR for the flutter/flutter repo stable or beta channel. Only use for flutter/flutter landed pull requests. Only use when the cherry pick request is into "stable", "beta" or a branch that has the format with flutter-.-candidate.0. --- # Flutter Cherry-Pick Workflow ## Constraints This skill has the following strict constraints: * **Target Repository:** Only use for the `flutter/flutter` repository. * **Target Channels:** Only use when the cherry-pick is targeted at `stable`, `beta`, or a release candidate branch matching the format `flutter-.-candidate.` (e.g., `flutter-3.10-candidate.0`). * **PR Status:** Only use for pull requests that have already been successfully merged into `master`. ## Quick Start Trigger this skill by providing a merged PR number or URL and optionally the target channel: * "Cherry pick PR 187045 to stable" * "Request CP to beta for https://github.com/flutter/flutter/pull/186952" * "CP PR 187045" (the agent will ask you to clarify the channel) ## Workflows ### Phase 1: Initialization and Channel Detection 1. **Identify Inputs:** - Original PR: `` (number or URL provided by the user). - Target Channel: `` (either `stable` or `beta`). 2. **Determine Channel:** - Parse the user's request for the target channel. - **GATING STEP:** If the target channel is not specified in the user's request, you **MUST STOP CALLING TOOLS AND ASK** the user: "Would you like to cherry-pick this to `stable` or `beta`?" and wait for their response before proceeding. 3. Verify you are in the root of the `flutter` repository. 4. **Verify Environment:** Ensure the repository is clean (no uncommitted changes). Run `git status --porcelain` to check. If there are pending changes, stop and ask the user to resolve them or stash them. ### Phase 2: Run Cherry-Pick Orchestrator 1. Run the helper script to start the process: ```bash .agents/skills/flutter-cherry-pick/scripts/flutter_cp.dart --pr --channel --action start ``` 2. **Evaluate Script Output:** * **Exit Code 0 (Success):** - The output will end with `SUCCESS:AUTOMATED:` or `SUCCESS:MANUAL:`. - Extract the `` number. - Proceed to **Phase 4: Fill Template**. * **Exit Code 2 (Conflicts):** - The cherry-pick encountered conflicts and the script checked out a local branch `cherry-pick--to-`. - Proceed to **Phase 3: Conflict Resolution**. * **Exit Code 1 (Error):** - An unexpected error occurred. Report the failure to the user. ### Phase 3: Conflict Resolution 1. **Analyze Conflicts:** - Identify the conflicted files from the script output (or run `git status --porcelain` to see unmerged files). 2. **Document Conflicts:** Articulate what conflicts were encountered and how they were resolved. You will need to include this information in the final PR description. 3. **Attempt Auto-Resolution:** - For each conflicted file, analyze the conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`). - If the conflict is simple (e.g., import ordering, minor formatting, non-overlapping changes), resolve it. 4. **User Fallback:** - If you cannot resolve the conflicts automatically or the conflicts reflect a change in logic that impacts flutter users: - Present the list of conflicted files to the user in the chat. - Ask the user to resolve them in their editor. - Stop calling tools and wait for the user to confirm resolution. 5. **Continue the Process:** - Once all conflicts are resolved (either by you or the user), run `git add ` to stage them. - Resume the orchestrator script: ```bash .agents/skills/flutter-cherry-pick/scripts/flutter_cp.dart --pr --channel --action continue ``` - The script will run `git cherry-pick --continue`, push, create the PR, and print `SUCCESS:MANUAL:`. - Extract the `` number and proceed to **Phase 4: Fill Template**. ### Phase 4: Fill Template and Apply 1. **Retrieve Template:** - Read the local cherry-pick template (located at `[PULL_REQUEST_CP_TEMPLATE](../../../.github/PR_TEMPLATE/PULL_REQUEST_CP_TEMPLATE.md)` relative to this skill). 2. **Gather Context:** - Parse the original PR description for linked issues (e.g., "Fixes #187322", "Closes #123"). - If found, fetch the issue details: `gh issue view --json title,body`. - Fetch original PR details if needed. - If conflicts were encountered and resolved in Phase 3, gather the documentation of those conflicts. 3. **Draft the Template:** - Fill in the retrieved template fields using LLM reasoning based on the issue and original PR context. - If conflicts were resolved, clearly document them in the PR description (e.g., in the "Description" or "Changelog" section), explaining what was resolved and how. - Keep the Markdown structure of the template intact. - **CRITICAL:** Remove any instructional text or guidelines within the sections (e.g., "What is the impact...", "Explain this cherry pick...") when replacing them with your responses. Do NOT remove explanations around checkboxes or selection items (e.g., "What is the risk level...", "Are you confident..."). - **Example of filling a text section (remove instructional text):** * *Before:* ```markdown ### Impact What is the impact of this cherry-pick? (Explain the impact on users...) ``` * *After:* ```markdown ### Impact This fixes a critical crash in the image decoder when rendering corrupted GIFs. ``` - **Example of filling a checkbox/selection section (do NOT remove options):** * *Before:* ```markdown ### Shared Engineering Cohort Were any engineering cohorts (e.g. Flutter Tooling, Engine, Framework) consulted? - [ ] Yes - [ ] No ``` * *After:* ```markdown ### Shared Engineering Cohort Were any engineering cohorts (e.g. Flutter Tooling, Engine, Framework) consulted? - [x] Yes - [ ] No ``` 4. **Review with User (GATING STEP):** - Present the drafted template to the user in the chat and ask for approval or edits. - **YOU MUST STOP CALLING TOOLS AND WAIT** for the user's explicit approval in the chat before proceeding. Do not attempt to apply the template pre-emptively. 5. **Apply Template, Update Title, and Add Label:** - **Only proceed to this step after receiving explicit user approval in the chat.** - Ensure the PR title is formatted as `[] `. - Ensure the `cp: review` label is added to the CP PR. - Once approved, update the CP PR description, title, and add the label: ```bash gh pr edit --title "[] " --body "" --add-label "cp: review" ``` *(Note: If `gh pr edit` fails due to GraphQL deprecation errors, you can use the REST API via `gh api` to update the body and add the label).* - Provide the user with the link to the new cherry-pick PR.