diff --git a/deps/agent-document-renderer b/deps/agent-document-renderer index 31fbe54..1095077 160000 --- a/deps/agent-document-renderer +++ b/deps/agent-document-renderer @@ -1 +1 @@ -Subproject commit 31fbe54fae8bf11be664919ce173da0d68ebfdc9 +Subproject commit 10950774736b64b5d8e544ce03d45ae5a6ceca7c diff --git a/internal/docgen/renderer_identity_generated.go b/internal/docgen/renderer_identity_generated.go index ec759b3..7dd2f37 100644 --- a/internal/docgen/renderer_identity_generated.go +++ b/internal/docgen/renderer_identity_generated.go @@ -2,6 +2,6 @@ package docgen -const rendererRevision = "31fbe54fae8bf11be664919ce173da0d68ebfdc9" +const rendererRevision = "10950774736b64b5d8e544ce03d45ae5a6ceca7c" const RendererIdentity = "agent-document-renderer@" + rendererRevision diff --git a/internal/docgen/renderer_integration_test.go b/internal/docgen/renderer_integration_test.go index d8b989d..55db1fe 100644 --- a/internal/docgen/renderer_integration_test.go +++ b/internal/docgen/renderer_integration_test.go @@ -367,7 +367,7 @@ func TestPersistedControlledMetadataRoutesBeforeDefaultProfileLoad(t *testing.T) } func TestRendererIdentityMatchesPublishedPin(t *testing.T) { - const want = "agent-document-renderer@31fbe54fae8bf11be664919ce173da0d68ebfdc9" + const want = "agent-document-renderer@10950774736b64b5d8e544ce03d45ae5a6ceca7c" if RendererIdentity != want { t.Fatalf("RendererIdentity = %q, want %q", RendererIdentity, want) } @@ -502,6 +502,71 @@ func TestGenerateReturnsTypedDiagnosticsForUnsafeMarkdownAndAssets(t *testing.T) } } +// TestRendererNodeDiagnosticsPassThroughUnchanged pins the wire contract for +// node-located content diagnostics: the renderer's codes, severities, NodeID +// and RulePath reach the manifest and the typed failure without rewriting. +func TestRendererNodeDiagnosticsPassThroughUnchanged(t *testing.T) { + warnings := []render.Diagnostic{ + {Code: "required_content_missing", Severity: render.SeverityWarning, NodeID: "node-7", RulePath: "mappings[2]", Message: "required node node-7 is empty", Suggestion: "add content"}, + {Code: "intentionally_empty", Severity: render.SeverityInfo, NodeID: "node-8", RulePath: "mappings[2]", Message: "node node-8 is intentionally empty"}, + {Code: "mapping_fallback", Severity: render.SeverityWarning, NodeID: "node-9", Message: "style not defined", Suggestion: "define the style"}, + } + deps := defaultGeneratorDependencies() + deps.newRenderer = func(*profile.AssetReader) render.Renderer { + return diagnosticsRenderer{diagnostics: warnings} + } + delivery, err := generate(context.Background(), workspaceRequest([]byte(representativeMarkdown)), deps) + if err != nil { + t.Fatalf("generate with warnings: %v", err) + } + var manifest Manifest + if err := json.Unmarshal(delivery.Manifest.Bytes, &manifest); err != nil { + t.Fatal(err) + } + if !reflect.DeepEqual(manifest.Diagnostics, warnings) { + t.Fatalf("manifest diagnostics = %#v, want renderer diagnostics %#v", manifest.Diagnostics, warnings) + } + for _, fragment := range []string{`"nodeId": "node-7"`, `"rulePath": "mappings[2]"`, `"code": "required_content_missing"`} { + if !strings.Contains(string(delivery.Manifest.Bytes), fragment) { + t.Errorf("manifest JSON omits %s", fragment) + } + } + + refusal := []render.Diagnostic{{Code: "mapping_unresolved", Severity: render.SeverityError, NodeID: "node-3", Message: "node node-3 cannot be mapped"}} + deps.newRenderer = func(*profile.AssetReader) render.Renderer { + return diagnosticsRenderer{diagnostics: refusal, err: errors.New("word: mapping unresolved for node node-3")} + } + _, err = generate(context.Background(), workspaceRequest([]byte(representativeMarkdown)), deps) + var diagnostic *DiagnosticError + if !errors.As(err, &diagnostic) { + t.Fatalf("refusal error %T %v is not a DiagnosticError", err, err) + } + if !reflect.DeepEqual(diagnostic.Diagnostics, refusal) { + t.Fatalf("refusal diagnostics = %#v, want %#v", diagnostic.Diagnostics, refusal) + } +} + +// diagnosticsRenderer returns fixed renderer diagnostics without a template, so +// the Backend's carriage of the renderer's diagnostics is tested on its own. +type diagnosticsRenderer struct { + diagnostics []render.Diagnostic + err error +} + +func (renderer diagnosticsRenderer) Validate(context.Context, render.Request) ([]render.Diagnostic, error) { + return renderer.diagnostics, renderer.err +} + +func (renderer diagnosticsRenderer) Render(context.Context, render.Request) (render.Result, error) { + if renderer.err != nil { + return render.Result{Diagnostics: renderer.diagnostics}, renderer.err + } + return render.Result{ + Artifact: []byte("docx"), MIME: "application/vnd.openxmlformats-officedocument.wordprocessingml.document", + Diagnostics: renderer.diagnostics, + }, nil +} + type failingRenderer struct{ err error } func (renderer failingRenderer) Validate(context.Context, render.Request) ([]render.Diagnostic, error) {