fix(docs): expose heading IDs in enumerator JSON

clawsweeper[bot] · clawsweeper[bot] · commit a8f8e863502e · 2026-06-15T15:21:09.000Z
diff --git a/internal/cmd/docs_enumerators.go b/internal/cmd/docs_enumerators.go
@@ -74,6 +74,7 @@ type docsParagraphListItem struct {
 	StartIndex int64  `json:"startIndex"`
 	EndIndex   int64  `json:"endIndex"`
 	Style      string `json:"style"`
+	HeadingID  string `json:"headingId,omitempty"`
 	Text       string `json:"text"`
 }
 
@@ -82,6 +83,7 @@ type docsParagraphInspectItem struct {
 	StartIndex int64              `json:"startIndex"`
 	EndIndex   int64              `json:"endIndex"`
 	Style      string             `json:"style"`
+	HeadingID  string             `json:"headingId,omitempty"`
 	Text       string             `json:"text"`
 	IsEmpty    bool               `json:"isEmpty"`
 	Runs       []docsParagraphRun `json:"runs"`
@@ -212,6 +214,7 @@ func (c *DocsHeadingsListCmd) Run(ctx context.Context, flags *RootFlags) error {
 			StartIndex: paragraph.StartIndex,
 			EndIndex:   paragraph.EndIndex,
 			Style:      paragraph.Style,
+			HeadingID:  paragraph.HeadingID,
 			Text:       paragraph.Text,
 		})
 	}
@@ -236,6 +239,7 @@ func (c *DocsParagraphsListCmd) Run(ctx context.Context, flags *RootFlags) error
 			StartIndex: paragraph.StartIndex,
 			EndIndex:   paragraph.EndIndex,
 			Style:      paragraph.Style,
+			HeadingID:  paragraph.HeadingID,
 			Text:       paragraph.Text,
 		}
 		items = append(items, item)
@@ -244,6 +248,7 @@ func (c *DocsParagraphsListCmd) Run(ctx context.Context, flags *RootFlags) error
 			StartIndex: item.StartIndex,
 			EndIndex:   item.EndIndex,
 			Style:      item.Style,
+			HeadingID:  item.HeadingID,
 			Text:       item.Text,
 			IsEmpty:    paragraph.IsEmpty,
 			Runs:       paragraph.Runs,
@@ -488,6 +493,7 @@ type docsEnumeratedParagraph struct {
 	StartIndex int64
 	EndIndex   int64
 	Style      string
+	HeadingID  string
 	Text       string
 	IsEmpty    bool
 	Runs       []docsParagraphRun
@@ -506,15 +512,19 @@ func enumerateDocsParagraphs(doc *docs.Document) []docsEnumeratedParagraph {
 			}
 			if element.Paragraph != nil {
 				style := docsNamedStyleNormalText
-				if element.Paragraph.ParagraphStyle != nil &&
-					element.Paragraph.ParagraphStyle.NamedStyleType != "" {
-					style = element.Paragraph.ParagraphStyle.NamedStyleType
+				headingID := ""
+				if paragraphStyle := element.Paragraph.ParagraphStyle; paragraphStyle != nil {
+					if paragraphStyle.NamedStyleType != "" {
+						style = paragraphStyle.NamedStyleType
+					}
+					headingID = paragraphStyle.HeadingId
 				}
 				isEmpty, runs := inspectDocsParagraph(element.Paragraph)
 				paragraphs = append(paragraphs, docsEnumeratedParagraph{
 					StartIndex: element.StartIndex,
 					EndIndex:   element.EndIndex,
 					Style:      style,
+					HeadingID:  headingID,
 					Text:       paragraphText(element.Paragraph),
 					IsEmpty:    isEmpty,
 					Runs:       runs,
diff --git a/internal/cmd/docs_enumerators_test.go b/internal/cmd/docs_enumerators_test.go
@@ -203,6 +203,53 @@ func TestDocsHeadingsAndParagraphsFilters(t *testing.T) {
 	}
 }
 
+func TestDocsHeadingsAndParagraphsJSONIncludeHeadingID(t *testing.T) {
+	t.Parallel()
+
+	response := map[string]any{
+		"documentId": "doc1",
+		"body": map[string]any{"content": []any{
+			rawStyledParagraphWithHeadingID(1, 12, "HEADING_1", "h.section", "Section\n"),
+			rawStyledParagraph(12, 20, "NORMAL_TEXT", "Body\n"),
+		}},
+	}
+	srv := newDocsRawTestServer(t, 0, response)
+	defer srv.Close()
+	svc := newMockDocsService(t, srv)
+
+	var output bytes.Buffer
+	ctx := withDocsTestService(newCmdRuntimeJSONOutputContext(t, &output, io.Discard), svc)
+	if err := runKong(t, &DocsHeadingsListCmd{}, []string{"doc1"}, ctx, &RootFlags{Account: "a@b.com"}); err != nil {
+		t.Fatalf("headings run: %v", err)
+	}
+	var headings struct {
+		Headings []docsParagraphListItem `json:"headings"`
+	}
+	if err := json.Unmarshal(output.Bytes(), &headings); err != nil {
+		t.Fatalf("unmarshal headings: %v\n%s", err, output.String())
+	}
+	if len(headings.Headings) != 1 || headings.Headings[0].HeadingID != "h.section" {
+		t.Fatalf("headings = %#v", headings.Headings)
+	}
+
+	output.Reset()
+	if err := runKong(t, &DocsParagraphsListCmd{}, []string{"doc1"}, ctx, &RootFlags{Account: "a@b.com"}); err != nil {
+		t.Fatalf("paragraphs run: %v", err)
+	}
+	var paragraphs struct {
+		Paragraphs []docsParagraphInspectItem `json:"paragraphs"`
+	}
+	if err := json.Unmarshal(output.Bytes(), &paragraphs); err != nil {
+		t.Fatalf("unmarshal paragraphs: %v\n%s", err, output.String())
+	}
+	if len(paragraphs.Paragraphs) != 2 || paragraphs.Paragraphs[0].HeadingID != "h.section" {
+		t.Fatalf("paragraphs = %#v", paragraphs.Paragraphs)
+	}
+	if paragraphs.Paragraphs[1].HeadingID != "" {
+		t.Fatalf("normal paragraph headingId = %q, want empty", paragraphs.Paragraphs[1].HeadingID)
+	}
+}
+
 func TestDocsParagraphsJSONIncludesRunsAndEmptiness(t *testing.T) {
 	t.Parallel()
 
@@ -436,11 +483,19 @@ func rawTableCell(text string) map[string]any {
 }
 
 func rawStyledParagraph(start, end int64, style, text string) map[string]any {
+	return rawStyledParagraphWithHeadingID(start, end, style, "", text)
+}
+
+func rawStyledParagraphWithHeadingID(start, end int64, style, headingID, text string) map[string]any {
+	paragraphStyle := map[string]any{"namedStyleType": style}
+	if headingID != "" {
+		paragraphStyle["headingId"] = headingID
+	}
 	return map[string]any{
 		"startIndex": start,
 		"endIndex":   end,
 		"paragraph": map[string]any{
-			"paragraphStyle": map[string]any{"namedStyleType": style},
+			"paragraphStyle": paragraphStyle,
 			"elements": []any{
 				map[string]any{
 					"startIndex": start,
