refactor(prompt): inline story ID and title into commit message template

Replace [Story ID] and [Story Title] placeholders with {{STORY_ID}} and
{{STORY_TITLE}} that get substituted at prompt build time, so the agent
gets the exact commit message instead of having to derive it from the
story context JSON.

Author: MiniCodeMonkey

embed/embed.go

@@ -26,10 +26,12 @@ var detectSetupPromptTemplate string
 // current story context substituted. The storyContext is the JSON of the
 // current story to work on, inlined directly into the prompt so that the
 // agent does not need to read the entire prd.json file.
-func GetPrompt(prdPath, progressPath, storyContext string) string {
+func GetPrompt(prdPath, progressPath, storyContext, storyID, storyTitle string) string {
 	result := strings.ReplaceAll(promptTemplate, "{{PRD_PATH}}", prdPath)
 	result = strings.ReplaceAll(result, "{{PROGRESS_PATH}}", progressPath)
-	return strings.ReplaceAll(result, "{{STORY_CONTEXT}}", storyContext)
+	result = strings.ReplaceAll(result, "{{STORY_CONTEXT}}", storyContext)
+	result = strings.ReplaceAll(result, "{{STORY_ID}}", storyID)
+	return strings.ReplaceAll(result, "{{STORY_TITLE}}", storyTitle)
 }
 
 // GetInitPrompt returns the PRD generator prompt with the PRD directory and optional context substituted.

embed/embed_test.go

@@ -9,7 +9,7 @@ func TestGetPrompt(t *testing.T) {
 	prdPath := "/path/to/prd.json"
 	progressPath := "/path/to/progress.md"
 	storyContext := `{"id":"US-001","title":"Test Story"}`
-	prompt := GetPrompt(prdPath, progressPath, storyContext)
+	prompt := GetPrompt(prdPath, progressPath, storyContext, "US-001", "Test Story")
 
 	// Verify all placeholders were substituted
 	if strings.Contains(prompt, "{{PRD_PATH}}") {
@@ -21,6 +21,17 @@ func TestGetPrompt(t *testing.T) {
 	if strings.Contains(prompt, "{{STORY_CONTEXT}}") {
 		t.Error("Expected {{STORY_CONTEXT}} to be substituted")
 	}
+	if strings.Contains(prompt, "{{STORY_ID}}") {
+		t.Error("Expected {{STORY_ID}} to be substituted")
+	}
+	if strings.Contains(prompt, "{{STORY_TITLE}}") {
+		t.Error("Expected {{STORY_TITLE}} to be substituted")
+	}
+
+	// Verify the commit message contains the exact story ID and title
+	if !strings.Contains(prompt, "feat: US-001 - Test Story") {
+		t.Error("Expected prompt to contain exact commit message 'feat: US-001 - Test Story'")
+	}
 
 	// Verify the PRD path appears in the prompt
 	if !strings.Contains(prompt, prdPath) {
@@ -52,7 +63,7 @@ func TestGetPrompt(t *testing.T) {
 }
 
 func TestGetPrompt_NoFileReadInstruction(t *testing.T) {
-	prompt := GetPrompt("/path/prd.json", "/path/progress.md", `{"id":"US-001"}`)
+	prompt := GetPrompt("/path/prd.json", "/path/progress.md", `{"id":"US-001"}`, "US-001", "Test Story")
 
 	// The prompt should NOT instruct Claude to read the PRD file
 	if strings.Contains(prompt, "Read the PRD") {
@@ -67,7 +78,7 @@ func TestPromptTemplateNotEmpty(t *testing.T) {
 }
 
 func TestGetPrompt_ChiefExclusion(t *testing.T) {
-	prompt := GetPrompt("/path/prd.json", "/path/progress.md", `{"id":"US-001"}`)
+	prompt := GetPrompt("/path/prd.json", "/path/progress.md", `{"id":"US-001"}`, "US-001", "Test Story")
 
 	// The prompt must instruct Claude to never stage or commit .chief/ files
 	if !strings.Contains(prompt, ".chief/") {

embed/prompt.txt

@@ -13,7 +13,7 @@ Your current story:
 2. After determining which story to work on, output exact story id, e.g.: <ralph-status>US-056</ralph-status>
 3. Implement the user story above
 4. Run quality checks (e.g., typecheck, lint, test - use whatever your project requires)
-5. If checks pass, commit changes with message: `feat: [Story ID] - [Story Title]`
+5. If checks pass, commit changes with message: `feat: {{STORY_ID}} - {{STORY_TITLE}}`
    - **NEVER stage or commit `.chief/` files** — these are local working files and must stay out of version control
    - Stage only the files you changed for the story (do NOT use `git add -A` or `git add .`)
 6. Update the PRD at `{{PRD_PATH}}` to set `passes: true` for the completed story

internal/loop/loop.go

@@ -102,12 +102,14 @@ func promptBuilderForPRD(prdPath string) func() (string, error) {
 			return "", fmt.Errorf("failed to load PRD for prompt: %w", err)
 		}
 
-		storyCtx := p.NextStoryContext()
-		if storyCtx == nil {
+		story := p.NextStory()
+		if story == nil {
 			return "", fmt.Errorf("all stories are complete")
 		}
 
-		return embed.GetPrompt(prdPath, prd.ProgressPath(prdPath), *storyCtx), nil
+		storyCtx := p.NextStoryContext()
+
+		return embed.GetPrompt(prdPath, prd.ProgressPath(prdPath), *storyCtx, story.ID, story.Title), nil
 	}
 }