feat(commit-message): Generate commit messages in the user's selected UI language instead of always using English.

.changeset/short-geckos-fry.md

@@ -0,0 +1,6 @@
+---
+"kilo-code": patch
+"@kilocode/cli": patch
+---
+
+Generate commit messages in the user's selected UI language instead of always using English.

packages/kilo-vscode/src/services/commit-message/index.ts

@@ -1,6 +1,7 @@
 import * as vscode from "vscode"
 import type { KiloConnectionService } from "../cli-backend/connection-service"
 import { getErrorMessage } from "../../kilo-provider-utils"
+import { selectedLocale } from "../i18n"
 
 let lastGeneratedMessage: string | undefined
 let lastWorkspacePath: string | undefined
@@ -94,7 +95,7 @@ export function registerCommitMessageService(
 
             try {
               const { data } = await client.commitMessage.generate(
-                { path, selectedFiles: undefined, previousMessage },
+                { path, selectedFiles: undefined, previousMessage, language: selectedLocale(vscode) },
                 { throwOnError: true, signal: controller.signal },
               )
               const message = data.message

packages/opencode/src/kilocode/commit-message/generate.ts

@@ -98,6 +98,11 @@ For significant changes, include a detailed body explaining the changes.
 
 Return ONLY the commit message in the conventional format, nothing else.`
 
+function languageInstruction(language?: string): string {
+  if (!language || language.toLowerCase() === "en") return ""
+  return `\n\n## Language Requirement\nCRITICAL: You MUST generate the commit message in the following language: ${language}. The entire commit message including type, scope, description, body, and footer MUST be in this language.`
+}
+
 function buildUserMessage(ctx: GitContext): string {
   const fileList = ctx.files.map((f) => `${f.status} ${f.path}`).join("\n")
   const diffs = ctx.files
@@ -162,7 +167,7 @@ export async function generateCommitMessage(request: CommitMessageRequest): Prom
     hidden: true,
     options: {},
     permission: [],
-    prompt: request.prompt || SYSTEM_PROMPT,
+    prompt: (request.prompt || SYSTEM_PROMPT) + languageInstruction(request.language),
     temperature: 0.3,
   }
 

packages/opencode/src/kilocode/commit-message/types.ts

@@ -7,6 +7,8 @@ export interface CommitMessageRequest {
   previousMessage?: string
   /** Optional custom system prompt — overrides the default conventional commits prompt */
   prompt?: string
+  /** Target language for the generated commit message (e.g. "zh", "en"). Falls back to English. */
+  language?: string
 }
 
 export interface CommitMessageResponse {

packages/opencode/src/kilocode/server/httpapi/groups/commit-message.ts

@@ -18,6 +18,9 @@ export const CommitMessagePayload = Schema.Struct({
   previousMessage: Schema.optional(Schema.String).annotate({
     description: "Previously generated message — triggers regeneration with a different result",
   }),
+  language: Schema.optional(Schema.String).annotate({
+    description: "Target language for the generated commit message (e.g. zh, en). Falls back to English.",
+  }),
 })
 
 const CommitMessageResponse = Schema.Struct({

packages/opencode/src/kilocode/server/httpapi/handlers/commit-message.ts

@@ -21,6 +21,7 @@ export const commitMessageHandlers = HttpApiBuilder.group(InstanceHttpApi, "comm
           selectedFiles: ctx.payload.selectedFiles ? [...ctx.payload.selectedFiles] : undefined,
           previousMessage: ctx.payload.previousMessage,
           prompt,
+          language: ctx.payload.language,
         }),
       )
       return { message: result.message }

packages/opencode/test/kilocode/commit-message/generate.test.ts

@@ -27,6 +27,12 @@ const defaultGitContext: GitContext = {
 let mockGitContext: GitContext = { ...defaultGitContext }
 let captured: { path: string; selected?: string[] } = { path: "" }
 
+function lastPrompt(): string | undefined {
+  const args = stream.mock.calls[stream.mock.calls.length - 1]
+  if (!args) return undefined
+  return (args[0] as { agent?: { prompt?: string } }).agent?.prompt
+}
+
 mock.module("@/agent/agent", () => ({
   ...realAgent,
   Agent: {},
@@ -162,6 +168,37 @@ describe("commit-message.generate", () => {
     test("uses custom prompt when provided", async () => {
       const result = await generateCommitMessage({ path: "/repo", prompt: "Write a haiku commit message." })
       expect(result.message).toBeTruthy()
+      expect(lastPrompt()).toContain("Write a haiku commit message.")
+    })
+  })
+
+  describe("language", () => {
+    test("does not add language instruction when language is omitted", async () => {
+      await generateCommitMessage({ path: "/repo" })
+      const prompt = lastPrompt()
+      expect(prompt).toBeTruthy()
+      expect(prompt).not.toContain("Language Requirement")
+    })
+
+    test("does not add language instruction when language is English", async () => {
+      await generateCommitMessage({ path: "/repo", language: "en" })
+      const prompt = lastPrompt()
+      expect(prompt).toBeTruthy()
+      expect(prompt).not.toContain("Language Requirement")
+    })
+
+    test("adds language instruction for non-English languages", async () => {
+      await generateCommitMessage({ path: "/repo", language: "zh" })
+      const prompt = lastPrompt()
+      expect(prompt).toContain("Language Requirement")
+      expect(prompt).toContain("following language: zh")
+    })
+
+    test("appends language instruction to custom prompt", async () => {
+      await generateCommitMessage({ path: "/repo", prompt: "Write a haiku commit message.", language: "zh" })
+      const prompt = lastPrompt()
+      expect(prompt).toContain("Write a haiku commit message.")
+      expect(prompt).toContain("Language Requirement")
     })
   })
 })

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

@@ -6329,6 +6329,7 @@ export class CommitMessage extends HeyApiClient {
       path?: string
       selectedFiles?: Array<string>
       previousMessage?: string
+      language?: string
     },
     options?: Options<never, ThrowOnError>,
   ) {
@@ -6342,6 +6343,7 @@ export class CommitMessage extends HeyApiClient {
             { in: "body", key: "path" },
             { in: "body", key: "selectedFiles" },
             { in: "body", key: "previousMessage" },
+            { in: "body", key: "language" },
           ],
         },
       ],

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

@@ -10081,6 +10081,7 @@ export type CommitMessageGenerateData = {
     path: string
     selectedFiles?: Array<string>
     previousMessage?: string
+    language?: string
   }
   path?: never
   query?: {

packages/sdk/openapi.json

@@ -11979,6 +11979,9 @@
                   },
                   "previousMessage": {
                     "type": "string"
+                  },
+                  "language": {
+                    "type": "string"
                   }
                 },
                 "required": ["path"],