Forward repair policy from D&D modules

2026-08-25 19:40:44 +00:00
parent e00cc45c6b
commit 0ef8931697
15 changed files with 57 additions and 50 deletions
--- a/docs/roadmap/implementation.md
+++ b/docs/roadmap/implementation.md
@@ -488,7 +488,7 @@ git diff --check
  calls.
 - Existing behavior remains unchanged while all values are nil.

-## Stage 7: Forward Repair Policy From Every LLM-Backed Module
+## Stage 7: Forward Repair Policy From Every LLM-Backed Module ✅

 ### Goal

--- a/internal/modules/dnd/chunk/scenes/chunker.go
+++ b/internal/modules/dnd/chunk/scenes/chunker.go
@@ -95,12 +95,13 @@ func (c *Chunker) Plan(ctx context.Context, req contracts.ChunkRequest) (contrac
 	}
 	var response chunkResponse
 	if _, err := c.llm.CompleteStructured(ctx, contracts.StructuredCompletionRequest{
-		StageName:     Key,
-		PromptID:      PromptID,
-		PromptVersion: ResponseSchemaVersion,
-		ProfileID:     req.LLMProfile,
-		SessionID:     req.SessionID,
-		Inputs:        shared.PromptInputs(req.SourceInput, req.References),
+		StageName:                      Key,
+		PromptID:                       PromptID,
+		PromptVersion:                  ResponseSchemaVersion,
+		ProfileID:                      req.LLMProfile,
+		SessionID:                      req.SessionID,
+		StructuredOutputRepairAttempts: req.StructuredOutputRepairAttempts,
+		Inputs:                         shared.PromptInputs(req.SourceInput, req.References),
 	}, &response); err != nil {
 		return contracts.ChunkPlanResult{}, chunkerErrorf("complete structured output: %w", err)
 	}
--- a/internal/modules/dnd/extract/combatturns/extractor.go
+++ b/internal/modules/dnd/extract/combatturns/extractor.go
@@ -209,12 +209,13 @@ func (e *Extractor) Extract(ctx context.Context, req contracts.TypedExtractionRe
 	inputs := shared.PromptInputs(sourceInput, req.References)
 	inputs[NPCRegistryReferenceSlot] = npcRegistry.PromptInput()
 	if _, err := e.llm.CompleteStructured(ctx, contracts.StructuredCompletionRequest{
-		StageName:     Key,
-		PromptID:      PromptID,
-		PromptVersion: SchemaVersion,
-		ProfileID:     req.LLMProfile,
-		SessionID:     req.SessionID,
-		Inputs:        inputs,
+		StageName:                      Key,
+		PromptID:                       PromptID,
+		PromptVersion:                  SchemaVersion,
+		ProfileID:                      req.LLMProfile,
+		SessionID:                      req.SessionID,
+		StructuredOutputRepairAttempts: req.StructuredOutputRepairAttempts,
+		Inputs:                         inputs,
 	}, &response); err != nil {
 		return contracts.TypedExtractionResult[dnd.CombatTurnList]{}, extractorErrorf("complete structured output: %w", err)
 	}
--- a/internal/modules/dnd/extract/enemyevents/extractor.go
+++ b/internal/modules/dnd/extract/enemyevents/extractor.go
@@ -143,12 +143,13 @@ func (e *Extractor) Extract(ctx context.Context, req contracts.TypedExtractionRe
 	}
 	var response extractionResponse
 	if _, err := e.llm.CompleteStructured(ctx, contracts.StructuredCompletionRequest{
-		StageName:     Key,
-		PromptID:      PromptID,
-		PromptVersion: SchemaVersion,
-		ProfileID:     req.LLMProfile,
-		SessionID:     req.SessionID,
-		Inputs:        inputs,
+		StageName:                      Key,
+		PromptID:                       PromptID,
+		PromptVersion:                  SchemaVersion,
+		ProfileID:                      req.LLMProfile,
+		SessionID:                      req.SessionID,
+		StructuredOutputRepairAttempts: req.StructuredOutputRepairAttempts,
+		Inputs:                         inputs,
 	}, &response); err != nil {
 		return contracts.TypedExtractionResult[dnd.EnemyEventList]{}, extractorErrorf("complete structured output: %w", err)
 	}
--- a/internal/modules/dnd/extract/itemoccurrences/extractor.go
+++ b/internal/modules/dnd/extract/itemoccurrences/extractor.go
@@ -157,7 +157,7 @@ func (e *Extractor) Extract(ctx context.Context, req contracts.TypedExtractionRe
 	inputs[ItemRegistryReferenceSlot] = registry.PromptInput()
 	if _, err := e.llm.CompleteStructured(ctx, contracts.StructuredCompletionRequest{
 		StageName: Key, PromptID: PromptID, PromptVersion: SchemaVersion,
-		ProfileID: req.LLMProfile, SessionID: req.SessionID, Inputs: inputs,
+		ProfileID: req.LLMProfile, SessionID: req.SessionID, StructuredOutputRepairAttempts: req.StructuredOutputRepairAttempts, Inputs: inputs,
 	}, &response); err != nil {
 		return contracts.TypedExtractionResult[dnd.ItemOccurrenceList]{}, extractorErrorf("complete structured output: %w", err)
 	}
--- a/internal/modules/dnd/extract/itemregistry/extractor.go
+++ b/internal/modules/dnd/extract/itemregistry/extractor.go
@@ -111,7 +111,7 @@ func (e *Extractor) Extract(ctx context.Context, req contracts.TypedExtractionRe
 	var response extractionResponse
 	if _, err := e.llm.CompleteStructured(ctx, contracts.StructuredCompletionRequest{
 		StageName: Key, PromptID: PromptID, PromptVersion: SchemaVersion,
-		ProfileID: req.LLMProfile, SessionID: req.SessionID,
+		ProfileID: req.LLMProfile, SessionID: req.SessionID, StructuredOutputRepairAttempts: req.StructuredOutputRepairAttempts,
 		Inputs: shared.PromptInputs(sourceInput, req.References),
 	}, &response); err != nil {
 		return contracts.TypedExtractionResult[dnd.ItemRegistry]{}, extractorErrorf("complete structured output: %w", err)
--- a/internal/modules/dnd/extract/locationoccurrences/extractor.go
+++ b/internal/modules/dnd/extract/locationoccurrences/extractor.go
@@ -153,7 +153,7 @@ func (e *Extractor) Extract(ctx context.Context, req contracts.TypedExtractionRe
 	inputs[LocationRegistryReferenceSlot] = grounding.PromptInput()
 	if _, err := e.llm.CompleteStructured(ctx, contracts.StructuredCompletionRequest{
 		StageName: Key, PromptID: PromptID, PromptVersion: SchemaVersion,
-		ProfileID: req.LLMProfile, SessionID: req.SessionID, Inputs: inputs,
+		ProfileID: req.LLMProfile, SessionID: req.SessionID, StructuredOutputRepairAttempts: req.StructuredOutputRepairAttempts, Inputs: inputs,
 	}, &response); err != nil {
 		return contracts.TypedExtractionResult[dnd.LocationOccurrenceList]{}, extractorErrorf("complete structured output: %w", err)
 	}
--- a/internal/modules/dnd/extract/locationregistry/extractor.go
+++ b/internal/modules/dnd/extract/locationregistry/extractor.go
@@ -111,7 +111,7 @@ func (e *Extractor) Extract(ctx context.Context, req contracts.TypedExtractionRe
 	var response extractionResponse
 	if _, err := e.llm.CompleteStructured(ctx, contracts.StructuredCompletionRequest{
 		StageName: Key, PromptID: PromptID, PromptVersion: SchemaVersion,
-		ProfileID: req.LLMProfile, SessionID: req.SessionID,
+		ProfileID: req.LLMProfile, SessionID: req.SessionID, StructuredOutputRepairAttempts: req.StructuredOutputRepairAttempts,
 		Inputs: shared.PromptInputs(sourceInput, req.References),
 	}, &response); err != nil {
 		return contracts.TypedExtractionResult[dnd.LocationRegistry]{}, extractorErrorf("complete structured output: %w", err)
--- a/internal/modules/dnd/extract/npcoccurrences/extractor.go
+++ b/internal/modules/dnd/extract/npcoccurrences/extractor.go
@@ -160,12 +160,13 @@ func (e *Extractor) Extract(ctx context.Context, req contracts.TypedExtractionRe
 	inputs := shared.PromptInputs(sourceInput, req.References)
 	inputs[NPCRegistryReferenceSlot] = npcRegistry.PromptInput()
 	if _, err := e.llm.CompleteStructured(ctx, contracts.StructuredCompletionRequest{
-		StageName:     Key,
-		PromptID:      PromptID,
-		PromptVersion: SchemaVersion,
-		ProfileID:     req.LLMProfile,
-		SessionID:     req.SessionID,
-		Inputs:        inputs,
+		StageName:                      Key,
+		PromptID:                       PromptID,
+		PromptVersion:                  SchemaVersion,
+		ProfileID:                      req.LLMProfile,
+		SessionID:                      req.SessionID,
+		StructuredOutputRepairAttempts: req.StructuredOutputRepairAttempts,
+		Inputs:                         inputs,
 	}, &response); err != nil {
 		return contracts.TypedExtractionResult[dnd.NPCOccurrenceList]{}, extractorErrorf("complete structured output: %w", err)
 	}
--- a/internal/modules/dnd/extract/npcregistry/extractor.go
+++ b/internal/modules/dnd/extract/npcregistry/extractor.go
@@ -118,12 +118,13 @@ func (e *Extractor) Extract(ctx context.Context, req contracts.TypedExtractionRe

 	var response extractionResponse
 	if _, err := e.llm.CompleteStructured(ctx, contracts.StructuredCompletionRequest{
-		StageName:     Key,
-		PromptID:      PromptID,
-		PromptVersion: SchemaVersion,
-		ProfileID:     req.LLMProfile,
-		SessionID:     req.SessionID,
-		Inputs:        shared.PromptInputs(sourceInput, req.References),
+		StageName:                      Key,
+		PromptID:                       PromptID,
+		PromptVersion:                  SchemaVersion,
+		ProfileID:                      req.LLMProfile,
+		SessionID:                      req.SessionID,
+		StructuredOutputRepairAttempts: req.StructuredOutputRepairAttempts,
+		Inputs:                         shared.PromptInputs(sourceInput, req.References),
 	}, &response); err != nil {
 		return contracts.TypedExtractionResult[dnd.NPCRegistry]{}, extractorErrorf("complete structured output: %w", err)
 	}
--- a/internal/modules/dnd/extract/scenedescriptions/extractor.go
+++ b/internal/modules/dnd/extract/scenedescriptions/extractor.go
@@ -120,12 +120,13 @@ func (e *Extractor) Extract(ctx context.Context, req contracts.TypedExtractionRe

 	var response extractionResponse
 	if _, err := e.llm.CompleteStructured(ctx, contracts.StructuredCompletionRequest{
-		StageName:     Key,
-		PromptID:      PromptID,
-		PromptVersion: SchemaVersion,
-		ProfileID:     req.LLMProfile,
-		SessionID:     req.SessionID,
-		Inputs:        shared.PromptInputs(sourceInput, req.References),
+		StageName:                      Key,
+		PromptID:                       PromptID,
+		PromptVersion:                  SchemaVersion,
+		ProfileID:                      req.LLMProfile,
+		SessionID:                      req.SessionID,
+		StructuredOutputRepairAttempts: req.StructuredOutputRepairAttempts,
+		Inputs:                         shared.PromptInputs(sourceInput, req.References),
 	}, &response); err != nil {
 		return contracts.TypedExtractionResult[dnd.SceneDescriptionList]{}, extractorErrorf("complete structured output: %w", err)
 	}
--- a/internal/modules/dnd/extract/spells/extractor.go
+++ b/internal/modules/dnd/extract/spells/extractor.go
@@ -183,12 +183,13 @@ func (e *Extractor) Extract(ctx context.Context, req contracts.TypedExtractionRe
 	inputs[spellcatalog.SpellCatalogReferenceSlot] = e.catalogPromptInput.Clone()
 	inputs[NPCRegistryReferenceSlot] = npcRegistry.PromptInput()
 	if _, err := e.llm.CompleteStructured(ctx, contracts.StructuredCompletionRequest{
-		StageName:     Key,
-		PromptID:      PromptID,
-		PromptVersion: SchemaVersion,
-		ProfileID:     req.LLMProfile,
-		SessionID:     req.SessionID,
-		Inputs:        inputs,
+		StageName:                      Key,
+		PromptID:                       PromptID,
+		PromptVersion:                  SchemaVersion,
+		ProfileID:                      req.LLMProfile,
+		SessionID:                      req.SessionID,
+		StructuredOutputRepairAttempts: req.StructuredOutputRepairAttempts,
+		Inputs:                         inputs,
 	}, &response); err != nil {
 		return contracts.TypedExtractionResult[dnd.SpellList]{}, extractorErrorf("complete structured output: %w", err)
 	}
--- a/internal/modules/dnd/normalize/itemregistry/normalizer.go
+++ b/internal/modules/dnd/normalize/itemregistry/normalizer.go
@@ -119,7 +119,7 @@ func (n *Normalizer) Normalize(ctx context.Context, req contracts.TypedNormalize
 	}
 	reconciliation, err := n.engine.Reconcile(ctx, semanticreconcile.Request{
 		StageName: Key, Source: req.Source, Candidates: candidates,
-		ProfileID: req.LLMProfile, SessionID: req.SessionID,
+		ProfileID: req.LLMProfile, SessionID: req.SessionID, StructuredOutputRepairAttempts: req.StructuredOutputRepairAttempts,
 	})
 	if err != nil {
 		return contracts.TypedNormalizeResult[dnd.ItemRegistry]{}, normalizerErrorf("reconcile semantic duplicates: %w", err)
--- a/internal/modules/dnd/normalize/locationregistry/normalizer.go
+++ b/internal/modules/dnd/normalize/locationregistry/normalizer.go
@@ -120,7 +120,7 @@ func (n *Normalizer) Normalize(ctx context.Context, req contracts.TypedNormalize
 	}
 	reconciliation, err := n.engine.Reconcile(ctx, semanticreconcile.Request{
 		StageName: Key, Source: req.Source, Candidates: candidates,
-		ProfileID: req.LLMProfile, SessionID: req.SessionID,
+		ProfileID: req.LLMProfile, SessionID: req.SessionID, StructuredOutputRepairAttempts: req.StructuredOutputRepairAttempts,
 	})
 	if err != nil {
 		return contracts.TypedNormalizeResult[dnd.LocationRegistry]{}, normalizerErrorf("reconcile semantic duplicates: %w", err)
--- a/internal/modules/dnd/normalize/npcregistry/normalizer.go
+++ b/internal/modules/dnd/normalize/npcregistry/normalizer.go
@@ -119,7 +119,7 @@ func (n *Normalizer) Normalize(ctx context.Context, req contracts.TypedNormalize
 	}
 	reconciliation, err := n.engine.Reconcile(ctx, semanticreconcile.Request{
 		StageName: Key, Source: req.Source, Candidates: candidates,
-		ProfileID: req.LLMProfile, SessionID: req.SessionID,
+		ProfileID: req.LLMProfile, SessionID: req.SessionID, StructuredOutputRepairAttempts: req.StructuredOutputRepairAttempts,
 	})
 	if err != nil {
 		return contracts.TypedNormalizeResult[dnd.NPCRegistry]{}, normalizerErrorf("reconcile semantic duplicates: %w", err)