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

buttons

Browse Source
This commit is contained in:
Ian Gulliver
2026-10-14 21:01:38 -07:00
parent 9e741ede32
commit b2bd894677
20 changed files with 585 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/openapi.yaml
+25 -6
View File
@@ -131,15 +131,34 @@ paths:
post:
operationId: mergeTask
description: >
Squashes the task's worktree, uncommitted changes included, into one commit on the project's
default branch, fast-forwards the project's checkout to it, then removes the worktree and branch.
Nothing is pushed. Refused while a turn is running or queued, and on merge conflicts.
Starts the same agent turn as merge-in. When that turn ends normally, byre squashes the task's worktree
into one commit on the project's default branch, fast-forwards the project's checkout to it, then removes
the worktree and branch and marks the task merged. Nothing is pushed. Refused while a turn is running or queued.
responses:
"200":
description: The merged task.
"202":
description: The merge turn was started or queued.
content:
application/json:
schema: { $ref: "#/components/schemas/Task" }
schema: { $ref: "#/components/schemas/AgentSession" }
"400": { $ref: "#/components/responses/Error" }
"404": { $ref: "#/components/responses/Error" }
"409": { $ref: "#/components/responses/Error" }
/api/tasks/{taskId}/merge-in:
parameters:
- { name: taskId, in: path, required: true, schema: { type: string } }
post:
operationId: mergeIn
description: >
Asks the task's agent to merge the project's default branch into the task branch, resolving any conflicts
and regenerating generated files. Sent to the task's idle session, or starts a session when it has none.
Refused while a turn is running or queued.
responses:
"202":
description: The merge turn was started or queued.
content:
application/json:
schema: { $ref: "#/components/schemas/AgentSession" }
"400": { $ref: "#/components/responses/Error" }
"404": { $ref: "#/components/responses/Error" }
"409": { $ref: "#/components/responses/Error" }