Skip to content

fix: update automate github issues skill for retry mechanisms#4

Merged
davideast merged 1 commit intomainfrom
fix/automate-gh
Feb 12, 2026
Merged

fix: update automate github issues skill for retry mechanisms#4
davideast merged 1 commit intomainfrom
fix/automate-gh

Conversation

@davideast
Copy link
Contributor

Provide Retry Dispatching for Merge Conflicts

Retry Flow

flowchart TD
    A["Update branch from main"] --> B{"422 Conflict?"}
    B -- No --> C["Wait for CI → Merge"]
    B -- Yes --> D["Close conflicting PR"]
    D --> E["Re-dispatch: new Jules session<br/>same task prompt, current main"]
    E --> F["Wait for new PR"]
    F --> A
Loading

Detailed Flow

flowchart TD
    subgraph analyze ["Phase 1: Analyze"]
        A1["Fetch open GitHub issues"] --> A2["Format as structured markdown"]
    end

    subgraph plan ["Phase 2: Plan"]
        A2 --> B1["Create Jules planning session"]
        B1 --> B2["Investigate: trace issues to source code"]
        B2 --> B3["Architect: design solutions with diffs"]
        B3 --> B4["Build File Ownership Matrix"]
        B4 --> B5{"Any file in 2+ tasks?"}
        B5 -- Yes --> B6["Merge overlapping tasks"]
        B6 --> B4
        B5 -- No --> B7["Write task plan to .fleet/"]
    end

    subgraph validate ["Phase 3: Validate"]
        B7 --> C1["Read issue_tasks.json"]
        C1 --> C2{"Ownership conflict?"}
        C2 -- Yes --> C3["❌ Abort before dispatch"]
        C2 -- No --> C4["✅ Safe to parallelize"]
    end

    subgraph dispatch ["Phase 4: Dispatch"]
        C4 --> D1["jules.all — spawn parallel sessions"]
        D1 --> D2["Each session targets same base branch"]
        D2 --> D3["Sessions produce PRs"]
    end

    subgraph merge ["Phase 5: Merge"]
        D3 --> E1["Process PRs sequentially by risk"]
        E1 --> E2["Update branch from base"]
        E2 --> E3{"Merge conflict?"}
        E3 -- No --> E4["Wait for CI"]
        E4 --> E5{"CI passed?"}
        E5 -- Yes --> E6["Squash merge"]
        E5 -- No --> E7["❌ Abort"]
        E6 --> E8{"More PRs?"}
        E8 -- Yes --> E1
        E8 -- No --> E9["✅ All merged"]
        E3 -- Yes --> E10{"Retries left?"}
        E10 -- No --> E11["❌ Escalate to human"]
        E10 -- Yes --> E12["Close old PR"]
        E12 --> E13["Re-dispatch: new Jules session\nagainst current base"]
        E13 --> E14["Wait for new PR"]
        E14 --> E2
    end

    style analyze fill:#1a2332,stroke:#2a4a6b,color:#e0e0e0
    style plan fill:#1a2332,stroke:#2a4a6b,color:#e0e0e0
    style validate fill:#1a2332,stroke:#2a4a6b,color:#e0e0e0
    style dispatch fill:#1a2332,stroke:#2a4a6b,color:#e0e0e0
    style merge fill:#1a2332,stroke:#2a4a6b,color:#e0e0e0
Loading

@davideast davideast merged commit 7a76d3b into main Feb 12, 2026
2 checks passed
@davideast davideast deleted the fix/automate-gh branch February 12, 2026 20:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants