Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/commit-message-surface-errors.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@kilocode/cli": patch
---

Show the real commit-message generation error instead of a generic "check server logs" toast.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ const CommitMessageResponse = Schema.Struct({

export class CommitMessageNoChangesError extends Schema.ErrorClass<CommitMessageNoChangesError>(
"CommitMessageNoChangesError",
)(
)({ message: Schema.String }, { httpApiStatus: 422 }) {}

export class CommitMessageFailedError extends Schema.ErrorClass<CommitMessageFailedError>("CommitMessageFailedError")(
{ message: Schema.String },
{ httpApiStatus: 422 },
) {}
Expand All @@ -42,7 +44,7 @@ export const CommitMessageApi = HttpApi.make("commit-message")
query: WorkspaceRoutingQuery,
payload: CommitMessagePayload,
success: described(CommitMessageResponse, "Generated commit message"),
error: [HttpApiError.BadRequest, CommitMessageNoChangesError],
error: [HttpApiError.BadRequest, CommitMessageNoChangesError, CommitMessageFailedError],
Comment thread
johnnyeric marked this conversation as resolved.
Resolved
}).annotateMerge(
OpenApi.annotations({
identifier: "commitMessage.generate",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { EffectBridge } from "@/effect/bridge"
import { InstanceHttpApi } from "@/server/routes/instance/httpapi/api"
import { Config } from "@/config/config"
import { generateCommitMessage, NoChangesError } from "@/kilocode/commit-message"
import { CommitMessageNoChangesError, CommitMessagePayload } from "../groups/commit-message"
import { CommitMessageFailedError, CommitMessageNoChangesError, CommitMessagePayload } from "../groups/commit-message"

export const commitMessageHandlers = HttpApiBuilder.group(InstanceHttpApi, "commit-message", (handlers) =>
Effect.gen(function* () {
Expand All @@ -28,6 +28,9 @@ export const commitMessageHandlers = HttpApiBuilder.group(InstanceHttpApi, "comm
if (defect instanceof NoChangesError) {
return Effect.fail(new CommitMessageNoChangesError({ message: defect.message }))
}
if (defect instanceof Error) {
return Effect.fail(new CommitMessageFailedError({ message: defect.message }))
Comment thread
johnnyeric marked this conversation as resolved.
Resolved
}
return Effect.die(defect)
}),
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { afterEach, describe, expect, test } from "bun:test"
import { afterEach, describe, expect, spyOn, test } from "bun:test"
import path from "path"
import { Server } from "../../../src/server/server"
import { CommitMessageRuntime } from "../../../src/kilocode/commit-message/generate"
import { resetDatabase } from "../../fixture/db"
import { disposeAllInstances, tmpdir } from "../../fixture/fixture"

Expand All @@ -21,4 +23,28 @@ describe("commit-message httpapi", () => {
expect(res.status).toBe(422)
expect(await res.json()).toEqual({ message: "No changes found to generate a commit message for" })
})

test("returns 422 with the real message when generation fails", async () => {
await using tmp = await tmpdir({ git: true })
await Bun.write(path.join(tmp.path, "note.txt"), "hello")

const model = spyOn(CommitMessageRuntime, "model").mockResolvedValue({
providerID: "test",
id: "test-small-model",
} as never)
const generate = spyOn(CommitMessageRuntime, "generate").mockRejectedValue(new Error("provider rate limited"))
try {
const res = await Server.Default().app.request("/commit-message", {
method: "POST",
headers: { "content-type": "application/json", "x-kilo-directory": tmp.path },
body: JSON.stringify({ path: tmp.path }),
})

expect(res.status).toBe(422)
expect(await res.json()).toEqual({ message: "Failed to generate commit message: provider rate limited" })
} finally {
generate.mockRestore()
model.mockRestore()
}
})
})
56 changes: 54 additions & 2 deletions packages/sdk/js/src/v2/gen/types.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ export type Event =
| EventWorkspaceStatus1
| EventWorktreeReady1
| EventWorktreeFailed1
| EventWorktreeSetupReady1
| EventServerConnected1
| EventGlobalDisposed1
| EventGlobalConfigUpdated1
Expand Down Expand Up @@ -209,6 +210,7 @@ export type Event =
| EventWorkspaceStatus
| EventWorktreeReady
| EventWorktreeFailed
| EventWorktreeSetupReady
| EventServerConnected
| EventGlobalDisposed
| EventGlobalConfigUpdated
Expand Down Expand Up @@ -1254,6 +1256,7 @@ export type GlobalEvent = {
| EventWorkspaceStatus
| EventWorktreeReady
| EventWorktreeFailed
| EventWorktreeSetupReady
| EventServerConnected
| EventGlobalDisposed
| EventGlobalConfigUpdated
Expand Down Expand Up @@ -2113,6 +2116,14 @@ export type GlobalEvent = {
message: string
}
}
| {
id: string
type: "worktree.setup.ready"
properties: {
name: string
branch?: string
}
}
| {
id: string
type: "server.connected"
Expand Down Expand Up @@ -3917,6 +3928,10 @@ export type CommitMessageNoChangesError = {
message: string
}

export type CommitMessageFailedError = {
message: string
}

export type ConfigOverlayResponse = {
scope: "global" | "project"
effective: Config
Expand Down Expand Up @@ -4729,6 +4744,7 @@ export type V2Event =
| WorkspaceStatus
| WorktreeReady
| WorktreeFailed
| WorktreeSetupReady
| ServerConnected
| GlobalDisposed
| GlobalConfigUpdated
Expand Down Expand Up @@ -6189,6 +6205,15 @@ export type EventWorktreeFailed = {
}
}

export type EventWorktreeSetupReady = {
id: string
type: "worktree.setup.ready"
properties: {
name: string
branch?: string
}
}

export type EventServerConnected = {
id: string
type: "server.connected"
Expand Down Expand Up @@ -9118,6 +9143,24 @@ export type WorktreeFailed = {
}
}

export type WorktreeSetupReady = {
id: string
metadata?: {
[key: string]: unknown
}
type: "worktree.setup.ready"
durable?: {
aggregateID: string
seq: number
version: number
}
location?: LocationRef
data: {
name: string
branch?: string
}
}

export type ServerConnected = {
id: string
metadata?: {
Expand Down Expand Up @@ -10157,6 +10200,15 @@ export type EventWorktreeFailed1 = {
}
}

export type EventWorktreeSetupReady1 = {
id: string
type: "worktree.setup.ready"
properties: {
name: string
branch?: string
}
}

export type EventServerConnected1 = {
id: string
type: "server.connected"
Expand Down Expand Up @@ -15093,9 +15145,9 @@ export type CommitMessageGenerateErrors = {
*/
400: EffectHttpApiErrorBadRequest | InvalidRequestError
/**
* CommitMessageNoChangesError
* CommitMessageNoChangesError | CommitMessageFailedError
*/
422: CommitMessageNoChangesError
422: CommitMessageNoChangesError | CommitMessageFailedError
}

export type CommitMessageGenerateError = CommitMessageGenerateErrors[keyof CommitMessageGenerateErrors]
Expand Down
Loading
Loading