Skip to content

Commit 4498fc9

Browse files
chore: generate
1 parent 2e7cf92 commit 4498fc9

5 files changed

Lines changed: 86 additions & 19 deletions

File tree

packages/opencode/src/server/routes/instance/httpapi/handlers/experimental.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ import { ConsoleSwitchPayload, SessionListQuery, ToolListQuery, WorktreeApiError
1616

1717
function mapWorktreeError<A, R>(self: Effect.Effect<A, Worktree.Error, R>) {
1818
return self.pipe(
19-
Effect.mapError(
20-
(error) => new WorktreeApiError({ name: error._tag, data: { message: error.message } }),
21-
),
19+
Effect.mapError((error) => new WorktreeApiError({ name: error._tag, data: { message: error.message } })),
2220
)
2321
}
2422

packages/opencode/src/worktree/index.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,9 @@ export const layer: Layer.Layer<
234234
{ cwd: ctx.worktree },
235235
)
236236
if (created.code !== 0) {
237-
return yield* new CreateFailedError({ message: created.stderr || created.text || "Failed to create git worktree" })
237+
return yield* new CreateFailedError({
238+
message: created.stderr || created.text || "Failed to create git worktree",
239+
})
238240
}
239241

240242
yield* project.addSandbox(ctx.project.id, info.directory).pipe(Effect.catch(() => Effect.void))
@@ -425,7 +427,9 @@ export const layer: Layer.Layer<
425427

426428
const stale = yield* locateWorktree(parseWorktreeList(next.text), directory)
427429
if (stale?.path) {
428-
return yield* new RemoveFailedError({ message: removed.stderr || removed.text || "Failed to remove git worktree" })
430+
return yield* new RemoveFailedError({
431+
message: removed.stderr || removed.text || "Failed to remove git worktree",
432+
})
429433
}
430434
}
431435

@@ -570,7 +574,9 @@ export const layer: Layer.Layer<
570574

571575
const cleanResult = yield* sweep(worktreePath)
572576
if (cleanResult.code !== 0) {
573-
return yield* new ResetFailedError({ message: cleanResult.stderr || cleanResult.text || "Failed to clean worktree" })
577+
return yield* new ResetFailedError({
578+
message: cleanResult.stderr || cleanResult.text || "Failed to clean worktree",
579+
})
574580
}
575581

576582
yield* gitExpect(

packages/sdk/js/src/v2/gen/sdk.gen.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ import type {
214214
WorktreeCreateErrors,
215215
WorktreeCreateInput,
216216
WorktreeCreateResponses,
217+
WorktreeListErrors,
217218
WorktreeListResponses,
218219
WorktreeRemoveErrors,
219220
WorktreeRemoveInput,
@@ -1256,7 +1257,7 @@ export class Worktree extends HeyApiClient {
12561257
},
12571258
],
12581259
)
1259-
return (options?.client ?? this.client).get<WorktreeListResponses, unknown, ThrowOnError>({
1260+
return (options?.client ?? this.client).get<WorktreeListResponses, WorktreeListErrors, ThrowOnError>({
12601261
url: "/experimental/worktree",
12611262
...options,
12621263
...params,

packages/sdk/js/src/v2/gen/types.gen.ts

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1409,6 +1409,20 @@ export type ToolList = Array<ToolListItem>
14091409

14101410
export type ToolIds = Array<string>
14111411

1412+
export type WorktreeError = {
1413+
name:
1414+
| "WorktreeNotGitError"
1415+
| "WorktreeNameGenerationFailedError"
1416+
| "WorktreeCreateFailedError"
1417+
| "WorktreeStartCommandFailedError"
1418+
| "WorktreeRemoveFailedError"
1419+
| "WorktreeResetFailedError"
1420+
| "WorktreeListFailedError"
1421+
data: {
1422+
message: string
1423+
}
1424+
}
1425+
14121426
export type WorktreeCreateInput = {
14131427
name?: string
14141428
/**
@@ -3843,9 +3857,9 @@ export type WorktreeRemoveData = {
38433857

38443858
export type WorktreeRemoveErrors = {
38453859
/**
3846-
* Bad request
3860+
* WorktreeError
38473861
*/
3848-
400: BadRequestError
3862+
400: WorktreeError
38493863
}
38503864

38513865
export type WorktreeRemoveError = WorktreeRemoveErrors[keyof WorktreeRemoveErrors]
@@ -3869,6 +3883,15 @@ export type WorktreeListData = {
38693883
url: "/experimental/worktree"
38703884
}
38713885

3886+
export type WorktreeListErrors = {
3887+
/**
3888+
* WorktreeError
3889+
*/
3890+
400: WorktreeError
3891+
}
3892+
3893+
export type WorktreeListError = WorktreeListErrors[keyof WorktreeListErrors]
3894+
38723895
export type WorktreeListResponses = {
38733896
/**
38743897
* List of worktree directories
@@ -3890,9 +3913,9 @@ export type WorktreeCreateData = {
38903913

38913914
export type WorktreeCreateErrors = {
38923915
/**
3893-
* Bad request
3916+
* WorktreeError
38943917
*/
3895-
400: BadRequestError
3918+
400: WorktreeError
38963919
}
38973920

38983921
export type WorktreeCreateError = WorktreeCreateErrors[keyof WorktreeCreateErrors]
@@ -3918,9 +3941,9 @@ export type WorktreeResetData = {
39183941

39193942
export type WorktreeResetErrors = {
39203943
/**
3921-
* Bad request
3944+
* WorktreeError
39223945
*/
3923-
400: BadRequestError
3946+
400: WorktreeError
39243947
}
39253948

39263949
export type WorktreeResetError = WorktreeResetErrors[keyof WorktreeResetErrors]

packages/sdk/openapi.json

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,6 +1013,16 @@
10131013
}
10141014
}
10151015
}
1016+
},
1017+
"400": {
1018+
"description": "WorktreeError",
1019+
"content": {
1020+
"application/json": {
1021+
"schema": {
1022+
"$ref": "#/components/schemas/WorktreeError"
1023+
}
1024+
}
1025+
}
10161026
}
10171027
},
10181028
"description": "List all sandbox worktrees for the current project.",
@@ -1057,11 +1067,11 @@
10571067
}
10581068
},
10591069
"400": {
1060-
"description": "Bad request",
1070+
"description": "WorktreeError",
10611071
"content": {
10621072
"application/json": {
10631073
"schema": {
1064-
"$ref": "#/components/schemas/BadRequestError"
1074+
"$ref": "#/components/schemas/WorktreeError"
10651075
}
10661076
}
10671077
}
@@ -1119,11 +1129,11 @@
11191129
}
11201130
},
11211131
"400": {
1122-
"description": "Bad request",
1132+
"description": "WorktreeError",
11231133
"content": {
11241134
"application/json": {
11251135
"schema": {
1126-
"$ref": "#/components/schemas/BadRequestError"
1136+
"$ref": "#/components/schemas/WorktreeError"
11271137
}
11281138
}
11291139
}
@@ -1183,11 +1193,11 @@
11831193
}
11841194
},
11851195
"400": {
1186-
"description": "Bad request",
1196+
"description": "WorktreeError",
11871197
"content": {
11881198
"application/json": {
11891199
"schema": {
1190-
"$ref": "#/components/schemas/BadRequestError"
1200+
"$ref": "#/components/schemas/WorktreeError"
11911201
}
11921202
}
11931203
}
@@ -12849,6 +12859,35 @@
1284912859
"type": "string"
1285012860
}
1285112861
},
12862+
"WorktreeError": {
12863+
"type": "object",
12864+
"properties": {
12865+
"name": {
12866+
"type": "string",
12867+
"enum": [
12868+
"WorktreeNotGitError",
12869+
"WorktreeNameGenerationFailedError",
12870+
"WorktreeCreateFailedError",
12871+
"WorktreeStartCommandFailedError",
12872+
"WorktreeRemoveFailedError",
12873+
"WorktreeResetFailedError",
12874+
"WorktreeListFailedError"
12875+
]
12876+
},
12877+
"data": {
12878+
"type": "object",
12879+
"properties": {
12880+
"message": {
12881+
"type": "string"
12882+
}
12883+
},
12884+
"required": ["message"],
12885+
"additionalProperties": false
12886+
}
12887+
},
12888+
"required": ["name", "data"],
12889+
"additionalProperties": false
12890+
},
1285212891
"WorktreeCreateInput": {
1285312892
"type": "object",
1285412893
"properties": {

0 commit comments

Comments
 (0)