diff --git a/.changeset/commit-message-surface-errors.md b/.changeset/commit-message-surface-errors.md new file mode 100644 index 000000000000..92415dcf556e --- /dev/null +++ b/.changeset/commit-message-surface-errors.md @@ -0,0 +1,5 @@ +--- +"@kilocode/cli": patch +--- + +Show the real commit-message generation error instead of a generic "check server logs" toast. diff --git a/packages/opencode/src/kilocode/server/httpapi/groups/commit-message.ts b/packages/opencode/src/kilocode/server/httpapi/groups/commit-message.ts index c584990646bd..ec5b44b53eb8 100644 --- a/packages/opencode/src/kilocode/server/httpapi/groups/commit-message.ts +++ b/packages/opencode/src/kilocode/server/httpapi/groups/commit-message.ts @@ -29,7 +29,9 @@ const CommitMessageResponse = Schema.Struct({ export class CommitMessageNoChangesError extends Schema.ErrorClass( "CommitMessageNoChangesError", -)( +)({ message: Schema.String }, { httpApiStatus: 422 }) {} + +export class CommitMessageFailedError extends Schema.ErrorClass("CommitMessageFailedError")( { message: Schema.String }, { httpApiStatus: 422 }, ) {} @@ -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], }).annotateMerge( OpenApi.annotations({ identifier: "commitMessage.generate", diff --git a/packages/opencode/src/kilocode/server/httpapi/handlers/commit-message.ts b/packages/opencode/src/kilocode/server/httpapi/handlers/commit-message.ts index 0ba0e444e098..f0376f9e1d1d 100644 --- a/packages/opencode/src/kilocode/server/httpapi/handlers/commit-message.ts +++ b/packages/opencode/src/kilocode/server/httpapi/handlers/commit-message.ts @@ -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* () { @@ -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 })) + } return Effect.die(defect) }), ) diff --git a/packages/opencode/test/kilocode/server/commit-message-no-changes.test.ts b/packages/opencode/test/kilocode/server/commit-message-no-changes.test.ts index b511d6201085..eaded614701e 100644 --- a/packages/opencode/test/kilocode/server/commit-message-no-changes.test.ts +++ b/packages/opencode/test/kilocode/server/commit-message-no-changes.test.ts @@ -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" @@ -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() + } + }) }) diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts index a601d4539cdc..4927916a5a08 100644 --- a/packages/sdk/js/src/v2/gen/types.gen.ts +++ b/packages/sdk/js/src/v2/gen/types.gen.ts @@ -91,6 +91,7 @@ export type Event = | EventWorkspaceStatus1 | EventWorktreeReady1 | EventWorktreeFailed1 + | EventWorktreeSetupReady1 | EventServerConnected1 | EventGlobalDisposed1 | EventGlobalConfigUpdated1 @@ -209,6 +210,7 @@ export type Event = | EventWorkspaceStatus | EventWorktreeReady | EventWorktreeFailed + | EventWorktreeSetupReady | EventServerConnected | EventGlobalDisposed | EventGlobalConfigUpdated @@ -1254,6 +1256,7 @@ export type GlobalEvent = { | EventWorkspaceStatus | EventWorktreeReady | EventWorktreeFailed + | EventWorktreeSetupReady | EventServerConnected | EventGlobalDisposed | EventGlobalConfigUpdated @@ -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" @@ -3917,6 +3928,10 @@ export type CommitMessageNoChangesError = { message: string } +export type CommitMessageFailedError = { + message: string +} + export type ConfigOverlayResponse = { scope: "global" | "project" effective: Config @@ -4729,6 +4744,7 @@ export type V2Event = | WorkspaceStatus | WorktreeReady | WorktreeFailed + | WorktreeSetupReady | ServerConnected | GlobalDisposed | GlobalConfigUpdated @@ -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" @@ -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?: { @@ -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" @@ -15093,9 +15145,9 @@ export type CommitMessageGenerateErrors = { */ 400: EffectHttpApiErrorBadRequest | InvalidRequestError /** - * CommitMessageNoChangesError + * CommitMessageNoChangesError | CommitMessageFailedError */ - 422: CommitMessageNoChangesError + 422: CommitMessageNoChangesError | CommitMessageFailedError } export type CommitMessageGenerateError = CommitMessageGenerateErrors[keyof CommitMessageGenerateErrors] diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json index ffe2f5446b03..10461bb9aa1c 100644 --- a/packages/sdk/openapi.json +++ b/packages/sdk/openapi.json @@ -11421,11 +11421,18 @@ } }, "422": { - "description": "CommitMessageNoChangesError", + "description": "CommitMessageNoChangesError | CommitMessageFailedError", "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/CommitMessageNoChangesError" + "anyOf": [ + { + "$ref": "#/components/schemas/CommitMessageNoChangesError" + }, + { + "$ref": "#/components/schemas/CommitMessageFailedError" + } + ] } } } @@ -25904,6 +25911,9 @@ { "$ref": "#/components/schemas/EventWorktreeFailed1" }, + { + "$ref": "#/components/schemas/EventWorktreeSetupReady1" + }, { "$ref": "#/components/schemas/EventServerConnected1" }, @@ -26258,6 +26268,9 @@ { "$ref": "#/components/schemas/EventWorktreeFailed" }, + { + "$ref": "#/components/schemas/EventWorktreeSetupReady" + }, { "$ref": "#/components/schemas/EventServerConnected" }, @@ -29405,6 +29418,9 @@ { "$ref": "#/components/schemas/EventWorktreeFailed" }, + { + "$ref": "#/components/schemas/EventWorktreeSetupReady" + }, { "$ref": "#/components/schemas/EventServerConnected" }, @@ -32384,6 +32400,34 @@ "required": ["id", "type", "properties"], "additionalProperties": false }, + { + "type": "object", + "properties": { + "id": { + "type": "string", + "pattern": "^evt_" + }, + "type": { + "type": "string", + "enum": ["worktree.setup.ready"] + }, + "properties": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "branch": { + "type": "string" + } + }, + "required": ["name"], + "additionalProperties": false + } + }, + "required": ["id", "type", "properties"], + "additionalProperties": false + }, { "type": "object", "properties": { @@ -37769,6 +37813,16 @@ "required": ["message"], "additionalProperties": false }, + "CommitMessageFailedError": { + "type": "object", + "properties": { + "message": { + "type": "string" + } + }, + "required": ["message"], + "additionalProperties": false + }, "ConfigOverlayResponse": { "type": "object", "properties": { @@ -40284,6 +40338,9 @@ { "$ref": "#/components/schemas/WorktreeFailed" }, + { + "$ref": "#/components/schemas/WorktreeSetupReady" + }, { "$ref": "#/components/schemas/ServerConnected" }, @@ -45403,6 +45460,33 @@ "required": ["id", "type", "properties"], "additionalProperties": false }, + "EventWorktreeSetupReady": { + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "type": { + "type": "string", + "enum": ["worktree.setup.ready"] + }, + "properties": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "branch": { + "type": "string" + } + }, + "required": ["name"], + "additionalProperties": false + } + }, + "required": ["id", "type", "properties"], + "additionalProperties": false + }, "EventServerConnected": { "type": "object", "properties": { @@ -54239,6 +54323,56 @@ "required": ["id", "type", "data"], "additionalProperties": false }, + "WorktreeSetupReady": { + "type": "object", + "properties": { + "id": { + "type": "string", + "pattern": "^evt_" + }, + "metadata": { + "type": "object" + }, + "type": { + "type": "string", + "enum": ["worktree.setup.ready"] + }, + "durable": { + "type": "object", + "properties": { + "aggregateID": { + "type": "string" + }, + "seq": { + "type": "integer" + }, + "version": { + "type": "integer" + } + }, + "required": ["aggregateID", "seq", "version"], + "additionalProperties": false + }, + "location": { + "$ref": "#/components/schemas/LocationRef" + }, + "data": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "branch": { + "type": "string" + } + }, + "required": ["name"], + "additionalProperties": false + } + }, + "required": ["id", "type", "data"], + "additionalProperties": false + }, "ServerConnected": { "type": "object", "properties": { @@ -57448,6 +57582,34 @@ "required": ["id", "type", "properties"], "additionalProperties": false }, + "EventWorktreeSetupReady1": { + "type": "object", + "properties": { + "id": { + "type": "string", + "pattern": "^evt_" + }, + "type": { + "type": "string", + "enum": ["worktree.setup.ready"] + }, + "properties": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "branch": { + "type": "string" + } + }, + "required": ["name"], + "additionalProperties": false + } + }, + "required": ["id", "type", "properties"], + "additionalProperties": false + }, "EventServerConnected1": { "type": "object", "properties": {