Merge pull request #3 from yamork779/feat/claude_message_enhance

Feat/claude message enhance

Author: uaoa

.gitignore

@@ -1,5 +1,6 @@
 node_modules
 .vscode-test/
+.vscode/
 *.vsix
 dist/
 out/

package.json

@@ -121,6 +121,18 @@
 					],
 					"description": "Which changes to use for generating commit messages",
 					"order": 7
+				},
+				"claudeCommit.claudeCodeManaged": {
+					"type": "boolean",
+					"default": false,
+					"markdownDescription": "Claude Code managed mode: Let Claude Code's haiku model generate commit messages with minimal intervention (only language hint provided). **Only works when preferredMethod is 'cli'**",
+					"order": 8
+				},
+				"claudeCommit.keepCoAuthoredBy": {
+					"type": "boolean",
+					"default": false,
+					"markdownDescription": "Keep Co-Authored-By signature in commit message. **Only works in Claude Code managed mode**",
+					"order": 9
 				}
 			}
 		}

src/cli/execution.ts

@@ -109,6 +109,69 @@ export async function generateWithCLI(
   }
 }
 
+export async function generateWithCLIManaged(
+  prompt: string,
+  repoPath: string,
+  progressCallback: ProgressCallback | null = null
+): Promise<string> {
+  const cliPath = await findClaudeCliPath();
+
+  if (!cliPath) {
+    throw new Error("Claude CLI path not found");
+  }
+
+  const escapedCliPath = cliPath.includes(" ") ? `"${cliPath}"` : cliPath;
+
+  const tmpDir = os.tmpdir();
+  const promptFile = path.join(
+    tmpDir,
+    `claude-commit-prompt-${Date.now()}.txt`
+  );
+
+  try {
+    await fs.promises.writeFile(promptFile, prompt, "utf-8");
+
+    if (progressCallback) {
+      progressCallback("Using haiku model (managed mode)...");
+    }
+
+    const command =
+      process.platform === "win32"
+        ? `type "${promptFile}" | ${escapedCliPath} -p --model haiku`
+        : `cat "${promptFile}" | ${escapedCliPath} -p --model haiku`;
+
+    const { stdout, stderr } = await execAsync(command, {
+      shell: process.platform === "win32" ? "cmd.exe" : "/bin/bash",
+      maxBuffer: 10 * 1024 * 1024,
+      timeout: 120000,
+      cwd: repoPath,
+    });
+
+    if (stderr && !stdout) {
+      throw new Error(`CLI error output: ${stderr.trim()}`);
+    }
+
+    return stdout.trim() || "chore: update code";
+  } catch (error) {
+    const err = error as NodeJS.ErrnoException & { killed?: boolean };
+    if (err.killed) {
+      throw new Error(
+        "CLI process timed out after 2 minutes. Try a smaller diff or check your connection."
+      );
+    }
+    if (err.code === "ENOENT") {
+      throw new Error(`CLI executable not found at: ${cliPath}`);
+    }
+    throw error;
+  } finally {
+    try {
+      await fs.promises.unlink(promptFile);
+    } catch {
+      // Ignore deletion errors
+    }
+  }
+}
+
 export async function generateWithAPI(
   prompt: string,
   progressCallback: ProgressCallback | null = null

src/extension.ts

@@ -23,14 +23,21 @@ export function activate(context: vscode.ExtensionContext): void {
 
         const repo = git.repositories[0] as GitRepository;
 
-        if (
-          repo.state.indexChanges.length === 0 &&
-          repo.state.workingTreeChanges.length === 0
-        ) {
-          vscode.window.showWarningMessage(
-            "No changes to commit. Stage files first."
-          );
-          return;
+        // Skip change check in Claude Code managed mode (Claude Code will detect changes itself)
+        const config = vscode.workspace.getConfiguration("claudeCommit");
+        const claudeCodeManaged = config.get<boolean>("claudeCodeManaged", false);
+        const preferredMethod = config.get<string>("preferredMethod", "auto");
+
+        if (!(claudeCodeManaged && preferredMethod === "cli")) {
+          if (
+            repo.state.indexChanges.length === 0 &&
+            repo.state.workingTreeChanges.length === 0
+          ) {
+            vscode.window.showWarningMessage(
+              "No changes to commit. Stage files first."
+            );
+            return;
+          }
         }
 
         let commitMessage: string | null = null;

src/generators/commit.ts

@@ -7,25 +7,47 @@ import {
   DiffSource,
 } from "../types";
 import { getDiff } from "../utils/git";
-import { createGenerationPrompt, createEditPrompt } from "../prompts/generation";
+import { createGenerationPrompt, createEditPrompt, createManagedPrompt } from "../prompts/generation";
 import {
   hasClaudeCodeCLI,
   promptForCliPath,
 } from "../cli/detection";
-import { generateWithCLI, generateWithAPI } from "../cli/execution";
+import { generateWithCLI, generateWithCLIManaged, generateWithAPI } from "../cli/execution";
 
 export async function generateCommitMessage(
   repo: GitRepository,
   language: Language = "en",
   progressCallback: ProgressCallback | null = null
 ): Promise<string> {
   const repoPath = repo.rootUri.fsPath;
+  const config = vscode.workspace.getConfiguration("claudeCommit");
+
+  const preferredMethod = config.get<GenerationMethod>("preferredMethod", "auto");
+
+  // Claude Code managed mode: minimal prompt, let Claude Code handle everything
+  // Only effective when preferredMethod is "cli"
+  const claudeCodeManaged = config.get<boolean>("claudeCodeManaged", false);
+
+  if (claudeCodeManaged && preferredMethod === "cli") {
+    if (progressCallback) {
+      progressCallback("Claude Code managed mode...");
+    }
+
+    if (!(await hasClaudeCodeCLI())) {
+      throw new Error(
+        "Claude Code managed mode requires Claude Code CLI. Please install it or disable managed mode."
+      );
+    }
+
+    const keepCoAuthoredBy = config.get<boolean>("keepCoAuthoredBy", false);
+    const prompt = createManagedPrompt(language, keepCoAuthoredBy);
+    return await generateWithCLIManaged(prompt, repoPath, progressCallback);
+  }
 
   if (progressCallback) {
     progressCallback("Getting git diff...");
   }
 
-  const config = vscode.workspace.getConfiguration("claudeCommit");
   const diffSource = config.get<DiffSource>("diffSource", "auto");
 
   const { diff, stats } = await getDiff(repoPath, diffSource);
@@ -42,8 +64,6 @@ export async function generateCommitMessage(
 
   const prompt = createGenerationPrompt(diff, stats, language, multiLine);
 
-  const preferredMethod = config.get<GenerationMethod>("preferredMethod", "auto");
-
   let commitMessage: string | undefined;
   let cliNotFound = false;
 

src/prompts/en.ts

@@ -63,6 +63,18 @@ docs(readme): updated installation instructions
 Return ONLY the commit message (one line), no explanations.`;
 }
 
+export function getManagedPrompt(keepCoAuthoredBy: boolean): string {
+  let prompt = `Generate a git commit message for current changes, in English, output only the commit message, no other text.`;
+  if (keepCoAuthoredBy) {
+    prompt += `
+
+Keep at the end of commit message:
+🤖 Generated with Claude Code
+Co-Authored-By: Claude <noreply@anthropic.com>`;
+  }
+  return prompt;
+}
+
 export function getEditPrompt(
   currentMessage: string,
   userFeedback: string,

src/prompts/generation.ts

@@ -15,6 +15,11 @@ export function createGenerationPrompt(
   return module.getGenerationPrompt(diff, stats, multiLine);
 }
 
+export function createManagedPrompt(lang: Language, keepCoAuthoredBy: boolean): string {
+  const module = promptModules[lang];
+  return module.getManagedPrompt(keepCoAuthoredBy);
+}
+
 export function createEditPrompt(
   currentMessage: string,
   userFeedback: string,

src/prompts/ua.ts

@@ -63,6 +63,18 @@ docs(readme): оновлено інструкції встановлення
 Поверни ТІЛЬКИ commit message (один рядок), без пояснень.`;
 }
 
+export function getManagedPrompt(keepCoAuthoredBy: boolean): string {
+  let prompt = `Згенеруй git commit message для поточних змін, українською мовою, лише commit message, без іншого тексту.`;
+  if (keepCoAuthoredBy) {
+    prompt += `
+
+В кінці commit message додай:
+🤖 Generated with Claude Code
+Co-Authored-By: Claude <noreply@anthropic.com>`;
+  }
+  return prompt;
+}
+
 export function getEditPrompt(
   currentMessage: string,
   userFeedback: string,

src/prompts/zh.ts

@@ -63,6 +63,18 @@ docs(readme): 更新了安装说明
 仅返回 commit message（一行），不要有任何解释。`;
 }
 
+export function getManagedPrompt(keepCoAuthoredBy: boolean): string {
+  let prompt = `为当前改动生成git commit message，使用中文，仅输出commit message内容，不要有其他多余输出。`;
+  if (keepCoAuthoredBy) {
+    prompt += `
+
+commit message 末尾保留:
+🤖 Generated with Claude Code
+Co-Authored-By: Claude <noreply@anthropic.com>`;
+  }
+  return prompt;
+}
+
 export function getEditPrompt(
   currentMessage: string,
   userFeedback: string,

src/types/index.ts

@@ -24,6 +24,8 @@ export interface ClaudeCommitConfig {
   language: "en" | "ua" | "zh";
   multiLineCommit: boolean;
   diffSource: "staged" | "all" | "auto";
+  claudeCodeManaged: boolean;
+  keepCoAuthoredBy: boolean;
 }
 
 export type ProgressCallback = (message: string) => void;