ai/byre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 15 Wiki Activity

Offer "After review" in the Merge dialog while a review runs

Browse Source
This commit is contained in:
Ian Gulliver
2026-10-16 22:34:14 -07:00
parent c2d0ff77d7
commit b28968a0bc
25 changed files with 835 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/api.gen.ts
+48 -2
View File
@@ -388,7 +388,7 @@ export interface paths {
};
get?: never;
put?: never;
/** @description Sets the task's merge_title to the confirmed title, then starts the same agent turn as merge-in, without its invitation to revise the title. When that turn ends normally, byre squashes the task's worktree into one commit titled with the task's merge_title on the project's default branch, authored by the caller with a Co-authored-by trailer for each of the task's co-authors, pushes it to origin, fast-forwards the project's checkout to it, then removes the worktree and branch and marks the task merged. While another task in the project is merging, the merge is held instead (merge_queued_at is set) and starts when no merge is in progress in the project and the task's session is idle, oldest first. The title is fixed from here until the task closes. Refused while a turn is running, or the merge is already held. With target parent, for a subtask only, the subtask's branch is merged into its parent task's branch instead: the parent's agent is asked to merge it (queued if it is mid-turn), and the subtask closes as merged once its branch is in the parent's HEAD at the end of one of the parent's turns (merging_into_parent is set until then). Refused while the subtask's turn is running or it is already merging into its parent. Either target is refused while the task has active subtasks of its own. */
/** @description Sets the task's merge_title to the confirmed title, then starts the same agent turn as merge-in, without its invitation to revise the title. When that turn ends normally, byre squashes the task's worktree into one commit titled with the task's merge_title on the project's default branch, authored by the caller with a Co-authored-by trailer for each of the task's co-authors, pushes it to origin, fast-forwards the project's checkout to it, then removes the worktree and branch and marks the task merged. While another task in the project is merging, the merge is held instead (merge_queued_at is set) and starts when no merge is in progress in the project and the task's session is idle, oldest first. The title is fixed from here until the task closes. Refused while a turn is running, or the merge is already held. With target parent, for a subtask only, the subtask's branch is merged into its parent task's branch instead: the parent's agent is asked to merge it (queued if it is mid-turn), and the subtask closes as merged once its branch is in the parent's HEAD at the end of one of the parent's turns (merging_into_parent is set until then). Refused while the subtask's turn is running or it is already merging into its parent. Either target is refused while the task has active subtasks of its own. With after_review, nothing starts yet: the request is recorded (merge_after_review is set) and made, as this caller and with this target, when the review of the task's latest snapshot finishes with no findings, that snapshot is still the latest and no turn is running; otherwise it is dropped with a transcript note. Refused (409) unless that review is running. */
post: operations["mergeTask"];
delete?: never;
options?: never;
@@ -396,6 +396,25 @@ export interface paths {
patch?: never;
trace?: never;
};
"/api/tasks/{taskId}/merge-after-review": {
parameters: {
query?: never;
header?: never;
path: {
taskId: string;
};
cookie?: never;
};
get?: never;
put?: never;
post?: never;
/** @description Withdraws a Merge with after_review that is still waiting for its review; nothing is merged. */
delete: operations["cancelMergeAfterReview"];
options?: never;
head?: never;
patch?: never;
trace?: never;
};
"/api/tasks/{taskId}/merge-in": {
parameters: {
query?: never;
@@ -1012,6 +1031,8 @@ export interface components {
parent_task_id?: string;
/** @description Whether a merge of this subtask into its parent was requested and the parent hasn't merged it yet. */
merging_into_parent: boolean;
/** @description Whether a Merge with after_review is waiting for the running review of the latest snapshot to finish. */
merge_after_review: boolean;
/**
* Format: int64
* @description The seq of the task's latest turn.ended event with summary: true; 0 when it has none.
@@ -2129,11 +2150,13 @@ export interface operations {
* @enum {string}
*/
target?: "main" | "parent";
/** @description Merge once the running review of the latest snapshot finishes with no findings, instead of now. */
after_review?: boolean;
};
};
};
responses: {
/** @description The merge was started or held. */
/** @description The merge was started, held, or set to start after the review. */
202: {
headers: {
[name: string]: unknown;
@@ -2147,6 +2170,29 @@ export interface operations {
409: components["responses"]["Error"];
};
};
cancelMergeAfterReview: {
parameters: {
query?: never;
header?: never;
path: {
taskId: string;
};
cookie?: never;
};
requestBody?: never;
responses: {
/** @description The request was withdrawn. */
200: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["Task"];
};
};
404: components["responses"]["Error"];
};
};
mergeIn: {
parameters: {
query?: never;