From 14f044ce4f92d756c5292a37d7e1a27b92b0fc96 Mon Sep 17 00:00:00 2001 From: taetaetae Date: Thu, 5 Feb 2026 23:36:57 +0900 Subject: [PATCH] refactor: extract default assistant content to shared constants Apply code review feedback from gemini-code-assist: - Move fallback strings to kirocommon package as exported constants - Update kiro_claude_request.go to use shared constants - Update kiro_openai_request.go to use shared constants - Improves maintainability and avoids duplication --- internal/translator/kiro/claude/kiro_claude_request.go | 4 ++-- internal/translator/kiro/common/constants.go | 8 ++++++++ internal/translator/kiro/openai/kiro_openai_request.go | 7 ++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/internal/translator/kiro/claude/kiro_claude_request.go b/internal/translator/kiro/claude/kiro_claude_request.go index f663a419..259ae9f5 100644 --- a/internal/translator/kiro/claude/kiro_claude_request.go +++ b/internal/translator/kiro/claude/kiro_claude_request.go @@ -889,9 +889,9 @@ func BuildAssistantMessageStruct(msg gjson.Result) KiroAssistantResponseMessage finalContent := contentBuilder.String() if strings.TrimSpace(finalContent) == "" { if len(toolUses) > 0 { - finalContent = "I'll help you with that." + finalContent = kirocommon.DefaultAssistantContentWithTools } else { - finalContent = "I understand." + finalContent = kirocommon.DefaultAssistantContent } log.Debugf("kiro: assistant content was empty, using default: %s", finalContent) } diff --git a/internal/translator/kiro/common/constants.go b/internal/translator/kiro/common/constants.go index 2327ab59..ab000972 100644 --- a/internal/translator/kiro/common/constants.go +++ b/internal/translator/kiro/common/constants.go @@ -29,6 +29,14 @@ const ( // InlineCodeMarker is the markdown inline code marker (backtick). InlineCodeMarker = "`" + // DefaultAssistantContentWithTools is the fallback content for assistant messages + // that have tool_use but no text content. Kiro API requires non-empty content. + DefaultAssistantContentWithTools = "I'll help you with that." + + // DefaultAssistantContent is the fallback content for assistant messages + // that have no content at all. Kiro API requires non-empty content. + DefaultAssistantContent = "I understand." + // KiroAgenticSystemPrompt is injected only for -agentic models to prevent timeouts on large writes. // AWS Kiro API has a 2-3 minute timeout for large file write operations. KiroAgenticSystemPrompt = ` diff --git a/internal/translator/kiro/openai/kiro_openai_request.go b/internal/translator/kiro/openai/kiro_openai_request.go index 25800928..9515848f 100644 --- a/internal/translator/kiro/openai/kiro_openai_request.go +++ b/internal/translator/kiro/openai/kiro_openai_request.go @@ -718,13 +718,10 @@ func buildAssistantMessageFromOpenAI(msg gjson.Result) KiroAssistantResponseMess // This can happen with compaction requests or error recovery scenarios finalContent := contentBuilder.String() if strings.TrimSpace(finalContent) == "" { - const defaultAssistantContentWithTools = "I'll help you with that." - const defaultAssistantContent = "I understand." - if len(toolUses) > 0 { - finalContent = defaultAssistantContentWithTools + finalContent = kirocommon.DefaultAssistantContentWithTools } else { - finalContent = defaultAssistantContent + finalContent = kirocommon.DefaultAssistantContent } log.Debugf("kiro-openai: assistant content was empty, using default: %s", finalContent) }