mirror of
https://github.com/fabro-sh/fabro.git
synced 2026-08-28 05:27:41 +00:00
Fabro
parent
d3cea87425
commit
ede36d9c30
6 changed files with 465 additions and 28 deletions
306
run.json
306
run.json
File diff suppressed because one or more lines are too long
118
stages/004-train@1/diff.patch
Normal file
118
stages/004-train@1/diff.patch
Normal file
|
|
@ -0,0 +1,118 @@
|
|||
diff --git a/lib/crates/fabro-cli/src/commands/install.rs b/lib/crates/fabro-cli/src/commands/install.rs
|
||||
index d5c2145e4..6c74b31a4 100644
|
||||
--- a/lib/crates/fabro-cli/src/commands/install.rs
|
||||
+++ b/lib/crates/fabro-cli/src/commands/install.rs
|
||||
@@ -948,7 +948,9 @@ fn build_github_app_manifest(app_name: &str, port: u16, web_url: &str) -> serde_
|
||||
"pull_requests": "write",
|
||||
"checks": "write",
|
||||
"issues": "write",
|
||||
- "emails": "read"
|
||||
+ "emails": "read",
|
||||
+ "vulnerability_alerts": "write",
|
||||
+ "organization_projects": "write"
|
||||
},
|
||||
"default_events": []
|
||||
})
|
||||
@@ -2662,6 +2664,14 @@ client_id = "client-id"
|
||||
manifest["setup_url"],
|
||||
serde_json::json!("https://app.example.com/setup"),
|
||||
);
|
||||
+ assert_eq!(
|
||||
+ manifest["default_permissions"]["vulnerability_alerts"],
|
||||
+ serde_json::json!("write"),
|
||||
+ );
|
||||
+ assert_eq!(
|
||||
+ manifest["default_permissions"]["organization_projects"],
|
||||
+ serde_json::json!("write"),
|
||||
+ );
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
diff --git a/lib/crates/fabro-server/src/install.rs b/lib/crates/fabro-server/src/install.rs
|
||||
index aae91785a..a24fd5b3b 100644
|
||||
--- a/lib/crates/fabro-server/src/install.rs
|
||||
+++ b/lib/crates/fabro-server/src/install.rs
|
||||
@@ -2053,7 +2053,9 @@ fn build_github_app_manifest(
|
||||
"pull_requests": "write",
|
||||
"checks": "write",
|
||||
"issues": "write",
|
||||
- "emails": "read"
|
||||
+ "emails": "read",
|
||||
+ "vulnerability_alerts": "write",
|
||||
+ "organization_projects": "write"
|
||||
},
|
||||
"default_events": []
|
||||
})
|
||||
diff --git a/merge-train-plan.md b/merge-train-plan.md
|
||||
deleted file mode 100644
|
||||
index e20c7423f..000000000
|
||||
--- a/merge-train-plan.md
|
||||
+++ /dev/null
|
||||
@@ -1,48 +0,0 @@
|
||||
-# Merge Train Plan
|
||||
-
|
||||
-Base branch: `main`
|
||||
-Requested order: **543, 544** (squash merge, rebase each onto latest main)
|
||||
-
|
||||
-## READY PRs (in merge order)
|
||||
-
|
||||
-| # | Title | Head branch | Author | Mergeable |
|
||||
-|---|-------|-------------|--------|-----------|
|
||||
-| 543 | feat: grant Dependabot alerts read/write to auto-created GitHub Apps | `add-dependabot-alerts-app-scope` | swerner | MERGEABLE |
|
||||
-| 544 | fix: grant organization_projects to auto-created GitHub Apps for Projects V2 | `add-organization-projects-app-scope` | swerner | MERGEABLE |
|
||||
-
|
||||
-Both are open, not draft, target `main`, and their head branches live in the
|
||||
-`fabro-sh/fabro` repo (not forks). Both are eligible.
|
||||
-
|
||||
-## SKIP list
|
||||
-
|
||||
-None.
|
||||
-
|
||||
-## Ordering notes
|
||||
-
|
||||
-Keep the requested order **543 → 544**. No logical dependency was detected; the
|
||||
-two PRs add independent GitHub App permissions. Order does not matter
|
||||
-functionally, so the given order stands — no human confirmation needed.
|
||||
-
|
||||
-## Conflict warnings
|
||||
-
|
||||
-**PR 544 will conflict after 543 merges** (expected — the train resolves it).
|
||||
-
|
||||
-Both PRs touch the exact same two files and the exact same regions:
|
||||
-
|
||||
-- `lib/crates/fabro-cli/src/commands/install.rs`
|
||||
- - `build_github_app_manifest`: both change the `"emails": "read"` line
|
||||
- (add trailing comma + a new permission key).
|
||||
- - 543 adds `"vulnerability_alerts": "write"`
|
||||
- - 544 adds `"organization_projects": "write"`
|
||||
- - Test block: both insert an `assert_eq!` on
|
||||
- `manifest["default_permissions"][...]` at the same line.
|
||||
-- `lib/crates/fabro-server/src/install.rs`
|
||||
- - `build_github_app_manifest`: same `"emails": "read"` line edit.
|
||||
-
|
||||
-**Resolution guidance for the train stage:** these are additive and
|
||||
-non-contradictory. When rebasing 544 onto main (after 543 is in), keep BOTH
|
||||
-permission keys in the manifest map and BOTH test assertions. The final
|
||||
-`default_permissions` block should contain `"emails": "read"`,
|
||||
-`"vulnerability_alerts": "write"`, and `"organization_projects": "write"`
|
||||
-(with correct trailing commas). Verify with
|
||||
-`cargo nextest run -p fabro-cli -p fabro-server` before pushing.
|
||||
diff --git a/merge-train-state.md b/merge-train-state.md
|
||||
new file mode 100644
|
||||
index 000000000..00dffc92e
|
||||
--- /dev/null
|
||||
+++ b/merge-train-state.md
|
||||
@@ -0,0 +1,13 @@
|
||||
+# Merge Train State
|
||||
+
|
||||
+Base branch: `main`
|
||||
+Order: 543 → 544 (squash)
|
||||
+
|
||||
+| # | Status | Reason |
|
||||
+|---|--------|--------|
|
||||
+| 543 | MERGED | Rebased onto main, all local + CI checks green, squash-merged. Merge commit 3e0db1feb. |
|
||||
+| 544 | MERGED | Rebased onto main (after 543); resolved expected install.rs conflicts by keeping BOTH permission keys (`vulnerability_alerts` + `organization_projects`) and BOTH test assertions. All local + CI checks green, squash-merged. Merge commit ec0a08afb. |
|
||||
+
|
||||
+Final main SHA: ec0a08afb3325a20b1d9cbf5b5b75b987202e546
|
||||
+
|
||||
+All queued PRs resolved (MERGED). No escalations. Train complete.
|
||||
1
stages/004-train@1/response.md
Normal file
1
stages/004-train@1/response.md
Normal file
|
|
@ -0,0 +1 @@
|
|||
{"outcome": "succeeded", "context_updates": {"final_main_sha": "ec0a08afb3325a20b1d9cbf5b5b75b987202e546", "pr_543": "MERGED", "pr_544": "MERGED", "summary": "Both queued PRs rebased, verified green locally and in CI, squash-merged in order. PR 543 (vulnerability_alerts) merged clean (merge commit 3e0db1feb). PR 544 (organization_projects) rebased onto main after 543; resolved expected install.rs conflicts by keeping both permission keys and both test assertions (merge commit ec0a08afb). No escalations, no branch-protection rejections."}}
|
||||
6
stages/004-train@1/status.json
Normal file
6
stages/004-train@1/status.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"outcome": "succeeded",
|
||||
"notes": "Stage completed: train",
|
||||
"failure_reason": null,
|
||||
"timestamp": "2026-07-01T22:13:59.292488117Z"
|
||||
}
|
||||
57
stages/005-report@1/prompt.md
Normal file
57
stages/005-report@1/prompt.md
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
Goal: Merge the pull requests 543,544 into main as a merge train: process them in the given order, rebasing each onto the latest main (so each PR is validated against the cumulative result of the ones before it), resolving conflicts, pushing, and merging with the squash method. Stop at the first PR that cannot be merged cleanly and report why.
|
||||
Run ID: 01KWFTMDQVT7SD0GRRWKXH776E
|
||||
Pipeline progress: 3 of 5 stages completed
|
||||
|
||||
## Stage: preflight
|
||||
- Status: succeeded
|
||||
- Handler: command
|
||||
- Script: `gh auth status 2>&1 && git fetch --prune origin 2>&1 && echo 'preflight ok'`
|
||||
- Output:
|
||||
```
|
||||
github.com
|
||||
✓ Logged in to github.com account fabro-sh-fabro[bot] (GITHUB_TOKEN)
|
||||
- Active account: true
|
||||
- Git operations protocol: https
|
||||
- Token: ghs_************************************
|
||||
preflight ok
|
||||
```
|
||||
|
||||
## Stage: plan
|
||||
- Status: succeeded
|
||||
- Handler: agent
|
||||
- Model: claude-opus-4-8
|
||||
- Tokens: 4.8k in / 2.3k out
|
||||
- Files touched: /home/daytona/workspace/fabro/merge-train-plan.md
|
||||
- Response:
|
||||
> Plan written to `merge-train-plan.md`.
|
||||
>
|
||||
> **Summary:**
|
||||
>
|
||||
> - **READY (2):** Both PRs qualify — open, not draft, target `main`, head branches in `fabro-sh/fabro` (not forks), both `MERGEABLE`.
|
||||
> 1. **#543** — `feat: grant Dependabot alerts read/write...` (branch `add-dependabot-alerts-app-scope`)
|
||||
> 2. **#544** — `fix: grant organization_projects...` (branch `add-organization-projects-app-scope`)
|
||||
> - **SKIP:** none.
|
||||
> - **Order:** keep requested **543 → 544**. No dependency; independent permission additions.
|
||||
> - **Conflict warning:** #544 **will conflict** after #543 merges. Both edit the identical `"emails": "read"` line and insert a test assertion at the same spot in `install.rs` (both cli + server crates). The conflict is additive/trivial — resolution is to **keep both permission keys** (`vulnerability_alerts` and `organization_projects`) and **both test assertions**, fix trailing commas, then verify with `cargo nextest run -p fabro-cli -p fabro-server`.
|
||||
>
|
||||
> Plan path: `/home/daytona/workspace/fabro/merge-train-plan.md`
|
||||
|
||||
## Stage: train
|
||||
- Status: succeeded
|
||||
- Handler: agent
|
||||
- Model: claude-opus-4-8
|
||||
- Tokens: 47.7k in / 21.7k out
|
||||
- Files touched: /home/daytona/workspace/fabro/lib/crates/fabro-cli/src/commands/install.rs, /home/daytona/workspace/fabro/lib/crates/fabro-server/src/install.rs, /home/daytona/workspace/fabro/merge-train-state.md
|
||||
- Response:
|
||||
> {"outcome": "succeeded", "context_updates": {"final_main_sha": "ec0a08afb3325a20b1d9cbf5b5b75b987202e546", "pr_543": "MERGED", "pr_544": "MERGED", "summary": "Both queued PRs rebased, verified green locally and in CI, squash-merged in order. PR 543 (vulnerability_alerts) merged clean (merge commit 3e0db1feb). PR 544 (organization_projects) rebased onto main after 543; resolved expected install.rs conflicts by keeping both permission keys and both test assertions (merge commit ec0a08afb). No escalations, no branch-protection rejections."}}
|
||||
|
||||
## Current context
|
||||
| Key | Value |
|
||||
|-----|-------|
|
||||
| final_main_sha | ec0a08afb3325a20b1d9cbf5b5b75b987202e546 |
|
||||
| pr_543 | MERGED |
|
||||
| pr_544 | MERGED |
|
||||
| summary | Both queued PRs rebased, verified green locally and in CI, squash-merged in order. PR 543 (vulnerability_alerts) merged clean (merge commit 3e0db1feb). PR 544 (organization_projects) rebased onto main after 543; resolved expected install.rs conflicts by keeping both permission keys and both test assertions (merge commit ec0a08afb). No escalations, no branch-protection rejections. |
|
||||
|
||||
|
||||
Summarize this merge-train run from context and merge-train-plan.md / merge-train-state.md. For every queued PR, report exactly one of: MERGED (with method and resulting base SHA), SKIPPED (why — e.g. draft, fork, already merged, wrong base), or BLOCKED (the precise reason and what was tried). For a BLOCKED PR, distinguish the failure class: an unresolved rebase conflict, a test/CI failure the agent could not fix, a human decision that ended the run, or a merge GitHub rejected because branch-protection requirements were not met (required review/status checks missing, the app is not a ruleset bypass actor, or require_last_push_approval invalidated the approval after the rebase force-push). End with the single clearest next action for each PR that did not merge. Do not merge, push, or rebase anything in this stage.
|
||||
5
stages/005-report@1/provider_used.json
Normal file
5
stages/005-report@1/provider_used.json
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"mode": "prompt",
|
||||
"provider": "anthropic",
|
||||
"model": "claude-opus-4-8"
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue