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
+48 -4
View File
@@ -121,7 +121,7 @@ export interface paths {
};
get?: never;
put?: never;
/** @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. */
/** @description 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. */
post: operations["mergeTask"];
delete?: never;
options?: never;
@@ -129,6 +129,25 @@ export interface paths {
patch?: never;
trace?: never;
};
"/api/tasks/{taskId}/merge-in": {
parameters: {
query?: never;
header?: never;
path: {
taskId: string;
};
cookie?: never;
};
get?: never;
put?: never;
/** @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. */
post: operations["mergeIn"];
delete?: never;
options?: never;
head?: never;
patch?: never;
trace?: never;
};
"/api/tasks/{taskId}/discard": {
parameters: {
query?: never;
@@ -893,13 +912,38 @@ export interface operations {
};
requestBody?: never;
responses: {
/** @description The merged task. */
200: {
/** @description The merge turn was started or queued. */
202: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["Task"];
"application/json": components["schemas"]["AgentSession"];
};
};
400: components["responses"]["Error"];
404: components["responses"]["Error"];
409: components["responses"]["Error"];
};
};
mergeIn: {
parameters: {
query?: never;
header?: never;
path: {
taskId: string;
};
cookie?: never;
};
requestBody?: never;
responses: {
/** @description The merge turn was started or queued. */
202: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["AgentSession"];
};
};
400: components["responses"]["Error"];