gut-cli 0.1.20 → 0.1.22

package/.gut/branch.md

@@ -9,7 +9,3 @@ Generate a clean, descriptive branch name based on the description. If a branch
 - Use kebab-case for description
 - Keep it short (under 50 chars total)
 - No special characters except hyphens and slashes
-
-## Output
-
-Respond with ONLY the branch name, nothing else.

package/.gut/changelog.md

@@ -16,11 +16,3 @@ Use Keep a Changelog format (https://keepachangelog.com/):
 - Breaking changes (highlight these)
 - Group related changes together
 - Write for end users, not developers (unless it's a library)
-
-## Output
-
-Respond with a JSON object containing:
-- version: Version string if detected (optional)
-- date: Release date in YYYY-MM-DD format
-- sections: Array of { type, items[] }
-- summary: Brief summary of this release (optional)

package/.gut/checkout.md

@@ -15,7 +15,3 @@ Analyze the git diff and generate a clean, descriptive branch name that captures
 - The main purpose of the changes
 - Whether it's a feature, fix, refactor, etc.
 - Key files or functionality being modified
-
-## Output
-
-Respond with ONLY the branch name, nothing else.

package/.gut/commit.md

@@ -10,7 +10,3 @@ Analyze the git diff and generate a concise, meaningful commit message.
 - Description should be lowercase, imperative mood, no period at end
 - Keep the first line under 72 characters
 - If changes are complex, add a blank line and bullet points for details
-
-## Output
-
-Respond with ONLY the commit message, nothing else.

package/.gut/explain-file.md

@@ -10,13 +10,4 @@ Analyze the file content and explain what it does, its purpose, and its role in
 - Dependencies and what it interacts with
 - Any important patterns or architecture decisions
 
-## Output
-
 Explain in a way that helps someone quickly understand this file's purpose and how it fits into the larger codebase.
-
-Respond with a JSON object containing:
-- summary: One-line summary
-- purpose: The purpose and role of this code
-- changes: Array of { file, description }
-- impact: What impact or role this has in the project
-- notes: Important considerations or caveats (optional)

package/.gut/explain.md

@@ -9,13 +9,4 @@ Analyze the changes based on the target type (commit, PR, file changes, etc.) an
 - The broader context and purpose
 - Any important implications or side effects
 
-## Output
-
 Explain in a way that helps someone understand not just the "what" but the "why" behind these changes.
-
-Respond with a JSON object containing:
-- summary: One-line summary
-- purpose: The purpose and role of this code
-- changes: Array of { file, description }
-- impact: What impact or role this has in the project
-- notes: Important considerations or caveats (optional)

package/.gut/find.md

@@ -11,9 +11,3 @@ Find the commits that best match the user's query. Consider:
 
 Return commits ordered by relevance (most relevant first).
 Only include commits that actually match the query - if none match well, return an empty array.
-
-## Output
-
-Respond with a JSON object containing:
-- matches: Array of { hash, reason }
-- summary: Brief summary of the search results (optional)

package/.gut/gitignore.md

@@ -14,7 +14,3 @@ Analyze the project structure and configuration files to generate an appropriate
 - Do NOT ignore files that should be tracked (source code, configs, etc.)
 - Keep the file organized with comments for each section
 - If an existing .gitignore is provided, preserve project-specific patterns from it
-
-## Output
-
-Respond with ONLY the .gitignore content, nothing else. Include section comments for clarity.

package/.gut/merge.md

@@ -10,10 +10,3 @@ Analyze the conflicted file content and provide a resolution.
 - Preserve all necessary functionality
 - The resolved content should be valid, working code
 - Do NOT include conflict markers (<<<<<<, =======, >>>>>>)
-
-## Output
-
-Respond with a JSON object containing:
-- resolvedContent: The resolved file content
-- explanation: Brief explanation of how the conflict was resolved
-- strategy: "ours" | "theirs" | "combined" | "rewritten"

package/.gut/pr.md

@@ -12,13 +12,3 @@ Generate a clear and informative PR title and description based on the branch in
   - ## Summary section with 2-3 bullet points
   - ## Changes section listing key modifications
   - ## Test Plan section (suggest what to test)
-
-## Output
-
-Respond in JSON format:
-```json
-{
-  "title": "...",
-  "body": "..."
-}
-```

package/.gut/review.md

@@ -8,11 +8,4 @@ You are an expert code reviewer. Analyze the git diff and provide a structured r
 - Code style and best practices
 - Suggestions for improvement
 
-## Output
-
 Be constructive and specific. Include line numbers when possible.
-
-Respond with a JSON object containing:
-- summary: Brief overall assessment
-- issues: Array of { severity: "critical"|"warning"|"suggestion", file, line?, message, suggestion? }
-- positives: Array of good practices observed

package/.gut/stash.md

@@ -8,7 +8,3 @@ Generate a short, descriptive stash name based on the diff.
 - Keep it under 50 characters total
 - Be specific about what the changes do
 - Use present tense
-
-## Output
-
-Respond with ONLY the stash name, nothing else.

package/.gut/summary.md

@@ -9,12 +9,3 @@ Generate a clear, professional work summary based on the git activity.
 - Highlight important achievements
 - Use clear, non-technical language where possible
 - Make it suitable for sharing with team or manager
-
-## Output
-
-Respond with a JSON object containing:
-- title: One-line title for the summary
-- overview: Brief overview of what was accomplished
-- highlights: Array of key accomplishments
-- details: Array of { category, items[] }
-- stats: { commits, filesChanged?, additions?, deletions? } (optional)

package/dist/index.js

@@ -334,7 +334,7 @@ function findTemplate(repoRoot, templateName) {
   }
   return null;
 }
-function buildPrompt(userTemplate, templateName, context, language) {
+function buildPrompt(userTemplate, templateName, context, language, outputFormat) {
   let contextXml = "<context>\n";
   for (const [key, value] of Object.entries(context)) {
     if (value) {
@@ -347,7 +347,12 @@ ${value}
   contextXml += "</context>\n\n";
   const template = userTemplate || loadTemplate(templateName);
   const langInstruction = language === "ja" ? "\n\nIMPORTANT: Respond in Japanese (\u65E5\u672C\u8A9E\u3067\u56DE\u7B54\u3057\u3066\u304F\u3060\u3055\u3044)." : "";
-  return contextXml + "<instructions>\n" + template + langInstruction + "\n</instructions>";
+  const outputSection = outputFormat ? `
+
+<output-format>
+${outputFormat}
+</output-format>` : "";
+  return contextXml + "<instructions>\n" + template + langInstruction + "\n</instructions>" + outputSection;
 }
 var DEFAULT_MODELS = {
   gemini: "gemini-2.0-flash",
@@ -397,7 +402,7 @@ async function generateCommitMessage(diff, options, template) {
   const model = await getModel(options);
   const prompt = buildPrompt(template, "commit", {
     diff: diff.slice(0, 8e3)
-  }, options.language);
+  }, options.language, "Respond with ONLY the commit message, nothing else.");
   const result = await generateText({
     model,
     prompt,
@@ -412,7 +417,13 @@ async function generatePRDescription(context, options, template) {
     currentBranch: context.currentBranch,
     commits: context.commits.map((c) => `- ${c}`).join("\n"),
     diff: context.diff.slice(0, 6e3)
-  }, options.language);
+  }, options.language, `Respond in JSON format:
+\`\`\`json
+{
+  "title": "...",
+  "body": "..."
+}
+\`\`\``);
   const result = await generateText({
     model,
     prompt,
@@ -599,7 +610,7 @@ async function generateBranchName(description, options, context, template) {
     description,
     type: context?.type,
     issue: context?.issue
-  }, options.language);
+  }, options.language, "Respond with ONLY the branch name, nothing else.");
   const result = await generateText({
     model,
     prompt,
@@ -611,7 +622,7 @@ async function generateBranchNameFromDiff(diff, options, template) {
   const model = await getModel(options);
   const prompt = buildPrompt(template, "checkout", {
     diff: diff.slice(0, 8e3)
-  }, options.language);
+  }, options.language, "Respond with ONLY the branch name, nothing else.");
   const result = await generateText({
     model,
     prompt,
@@ -623,7 +634,7 @@ async function generateStashName(diff, options, template) {
   const model = await getModel(options);
   const prompt = buildPrompt(template, "stash", {
     diff: diff.slice(0, 4e3)
-  }, options.language);
+  }, options.language, "Respond with ONLY the stash name, nothing else.");
   const result = await generateText({
     model,
     prompt,
@@ -694,7 +705,7 @@ async function generateGitignore(context, options, template) {
     files: context.files,
     configFiles: context.configFiles,
     existingGitignore: context.existingGitignore
-  }, options.language);
+  }, options.language, "Respond with ONLY the .gitignore content, nothing else. No explanations or markdown code blocks.");
   const result = await generateText({
     model,
     prompt,