feat(drive): extend +add-comment to support slides targets (#674)

Change-Id: Id87ecce098d87f7db82389a73f3134b66fcd4814

Author: ethan-zhx

shortcuts/drive/drive_add_comment.go

@@ -64,7 +64,7 @@ const (
 var DriveAddComment = common.Shortcut{
 	Service:     "drive",
 	Command:     "+add-comment",
-	Description: "Add a full-document or local comment to doc/docx/sheet, also supports wiki URL resolving to doc/docx/sheet",
+	Description: "Add a comment to doc/docx/sheet/slides, also supports wiki URL resolving to doc/docx/sheet/slides",
 	Risk:        "write",
 	Scopes: []string{
 		"docx:document:readonly",
@@ -73,12 +73,12 @@ var DriveAddComment = common.Shortcut{
 	},
 	AuthTypes: []string{"user", "bot"},
 	Flags: []common.Flag{
-		{Name: "doc", Desc: "document URL/token, sheet URL, or wiki URL that resolves to doc/docx/sheet", Required: true},
-		{Name: "type", Desc: "document type: doc, docx, sheet (required when --doc is a bare token; auto-detected for URLs)", Enum: []string{"doc", "docx", "sheet"}},
+		{Name: "doc", Desc: "document URL/token, sheet/slides URL, or wiki URL that resolves to doc/docx/sheet/slides", Required: true},
+		{Name: "type", Desc: "document type: doc, docx, sheet, slides (required when --doc is a bare token; auto-detected for URLs)", Enum: []string{"doc", "docx", "sheet", "slides"}},
 		{Name: "content", Desc: "reply_elements JSON string", Required: true},
 		{Name: "full-comment", Type: "bool", Desc: "create a full-document comment; also the default when no location is provided"},
 		{Name: "selection-with-ellipsis", Desc: "target content locator (plain text or 'start...end')"},
-		{Name: "block-id", Desc: "for docx: anchor block ID; for sheet: <sheetId>!<cell> (e.g. a281f9!D6)"},
+		{Name: "block-id", Desc: "for docx: anchor block ID; for sheet: <sheetId>!<cell> (e.g. a281f9!D6); for slides: <slide-block-type>!<xml-id> (e.g. shape!bPq)"},
 	},
 	Validate: func(ctx context.Context, runtime *common.RuntimeContext) error {
 		docRef, err := parseCommentDocRef(runtime.Str("doc"), runtime.Str("type"))
@@ -104,6 +104,18 @@ var DriveAddComment = common.Shortcut{
 			}
 			return nil
 		}
+		if docRef.Kind == "slides" {
+			if _, _, err := parseSlidesBlockRef(runtime.Str("block-id")); err != nil {
+				return err
+			}
+			if runtime.Bool("full-comment") {
+				return output.ErrValidation("--full-comment is not applicable for slide comments; use --block-id <slide-block-type>!<xml-id>")
+			}
+			if strings.TrimSpace(runtime.Str("selection-with-ellipsis")) != "" {
+				return output.ErrValidation("--selection-with-ellipsis is not applicable for slide comments; use --block-id <slide-block-type>!<xml-id>")
+			}
+			return nil
+		}
 
 		selection := runtime.Str("selection-with-ellipsis")
 		blockID := strings.TrimSpace(runtime.Str("block-id"))
@@ -116,15 +128,17 @@ var DriveAddComment = common.Shortcut{
 
 		mode := resolveCommentMode(runtime.Bool("full-comment"), selection, blockID)
 		if mode == commentModeLocal && docRef.Kind == "doc" {
-			return output.ErrValidation("local comments only support docx and sheet; old doc format only supports full comments")
+			return output.ErrValidation("local comments only support docx, sheet, and slides; old doc format only supports full comments")
 		}
 
 		return nil
 	},
 	DryRun: func(ctx context.Context, runtime *common.RuntimeContext) *common.DryRunAPI {
 		docRef, _ := parseCommentDocRef(runtime.Str("doc"), runtime.Str("type"))
 		replyElements, _ := parseCommentReplyElements(runtime.Str("content"))
+		selection := runtime.Str("selection-with-ellipsis")
 		blockID := strings.TrimSpace(runtime.Str("block-id"))
+		mode := resolveCommentMode(runtime.Bool("full-comment"), selection, blockID)
 
 		// For wiki URLs, resolve the actual target type via API so dry-run
 		// matches real execution behavior instead of guessing from --block-id.
@@ -133,11 +147,12 @@ var DriveAddComment = common.Shortcut{
 		isWiki := false
 		if docRef.Kind == "wiki" {
 			isWiki = true
-			target, err := resolveCommentTarget(ctx, runtime, runtime.Str("doc"), commentModeFull)
-			if err == nil {
-				resolvedKind = target.FileType
-				resolvedToken = target.FileToken
+			target, err := resolveCommentTarget(ctx, runtime, runtime.Str("doc"), mode)
+			if err != nil {
+				return common.NewDryRunAPI().Set("error", err.Error())
 			}
+			resolvedKind = target.FileType
+			resolvedToken = target.FileToken
 		}
 
 		// Sheet comment dry-run.
@@ -146,7 +161,7 @@ var DriveAddComment = common.Shortcut{
 			if anchor == nil {
 				anchor = &sheetAnchor{SheetID: "<sheetId>", Col: 0, Row: 0}
 			}
-			commentBody := buildCommentCreateV2Request("sheet", "", replyElements, anchor)
+			commentBody := buildCommentCreateV2Request("sheet", "", "", replyElements, anchor)
 			desc := "1-step request: create sheet comment"
 			if isWiki {
 				desc = "2-step orchestration: resolve wiki -> create sheet comment"
@@ -157,15 +172,28 @@ var DriveAddComment = common.Shortcut{
 				Body(commentBody).
 				Set("file_token", resolvedToken)
 		}
+		if resolvedKind == "slides" {
+			slideAnchorBlockID, slideBlockType, err := parseSlidesBlockRef(blockID)
+			if err != nil {
+				return common.NewDryRunAPI().Set("error", err.Error())
+			}
+			commentBody := buildCommentCreateV2Request("slides", slideAnchorBlockID, slideBlockType, replyElements, nil)
+			desc := "1-step request: create slide block comment"
+			if isWiki {
+				desc = "2-step orchestration: resolve wiki -> create slide block comment"
+			}
+			return common.NewDryRunAPI().
+				Desc(desc).
+				POST("/open-apis/drive/v1/files/:file_token/new_comments").
+				Body(commentBody).
+				Set("file_token", resolvedToken)
+		}
 
 		// Doc/docx comment dry-run.
-		selection := runtime.Str("selection-with-ellipsis")
-		mode := resolveCommentMode(runtime.Bool("full-comment"), selection, blockID)
-
 		createPath := "/open-apis/drive/v1/files/:file_token/new_comments"
-		commentBody := buildCommentCreateV2Request(resolvedKind, "", replyElements, nil)
+		commentBody := buildCommentCreateV2Request(resolvedKind, "", "", replyElements, nil)
 		if mode == commentModeLocal {
-			commentBody = buildCommentCreateV2Request(resolvedKind, anchorBlockIDForDryRun(blockID), replyElements, nil)
+			commentBody = buildCommentCreateV2Request(resolvedKind, anchorBlockIDForDryRun(blockID), "", replyElements, nil)
 		}
 
 		mcpEndpoint := common.MCPEndpoint(runtime.Config.Brand)
@@ -240,6 +268,9 @@ var DriveAddComment = common.Shortcut{
 		if docRef.Kind == "sheet" {
 			return executeSheetComment(runtime, docRef)
 		}
+		if docRef.Kind == "slides" {
+			return executeSlidesComment(runtime, docRef)
+		}
 
 		selection := runtime.Str("selection-with-ellipsis")
 		blockID := strings.TrimSpace(runtime.Str("block-id"))
@@ -254,6 +285,9 @@ var DriveAddComment = common.Shortcut{
 		if target.FileType == "sheet" {
 			return executeSheetComment(runtime, commentDocRef{Kind: "sheet", Token: target.FileToken})
 		}
+		if target.FileType == "slides" {
+			return executeSlidesComment(runtime, commentDocRef{Kind: "slides", Token: target.FileToken})
+		}
 
 		replyElements, err := parseCommentReplyElements(runtime.Str("content"))
 		if err != nil {
@@ -283,9 +317,9 @@ var DriveAddComment = common.Shortcut{
 		}
 
 		requestPath := fmt.Sprintf("/open-apis/drive/v1/files/%s/new_comments", validate.EncodePathSegment(target.FileToken))
-		requestBody := buildCommentCreateV2Request(target.FileType, "", replyElements, nil)
+		requestBody := buildCommentCreateV2Request(target.FileType, "", "", replyElements, nil)
 		if mode == commentModeLocal {
-			requestBody = buildCommentCreateV2Request(target.FileType, blockID, replyElements, nil)
+			requestBody = buildCommentCreateV2Request(target.FileType, blockID, "", replyElements, nil)
 		}
 
 		if mode == commentModeLocal {
@@ -358,14 +392,17 @@ func parseCommentDocRef(input, docType string) (commentDocRef, error) {
 	if token, ok := extractURLToken(raw, "/sheets/"); ok {
 		return commentDocRef{Kind: "sheet", Token: token}, nil
 	}
+	if token, ok := extractURLToken(raw, "/slides/"); ok {
+		return commentDocRef{Kind: "slides", Token: token}, nil
+	}
 	if token, ok := extractURLToken(raw, "/docx/"); ok {
 		return commentDocRef{Kind: "docx", Token: token}, nil
 	}
 	if token, ok := extractURLToken(raw, "/doc/"); ok {
 		return commentDocRef{Kind: "doc", Token: token}, nil
 	}
 	if strings.Contains(raw, "://") {
-		return commentDocRef{}, output.ErrValidation("unsupported --doc input %q: use a doc/docx/sheet URL, a token with --type, or a wiki URL that resolves to doc/docx/sheet", raw)
+		return commentDocRef{}, output.ErrValidation("unsupported --doc input %q: use a doc/docx/sheet/slides URL, a token with --type, or a wiki URL that resolves to doc/docx/sheet/slides", raw)
 	}
 	if strings.ContainsAny(raw, "/?#") {
 		return commentDocRef{}, output.ErrValidation("unsupported --doc input %q: use a token with --type, or a wiki URL", raw)
@@ -374,7 +411,7 @@ func parseCommentDocRef(input, docType string) (commentDocRef, error) {
 	// Bare token: --type is required.
 	docType = strings.TrimSpace(docType)
 	if docType == "" {
-		return commentDocRef{}, output.ErrValidation("--type is required when --doc is a bare token (allowed values: doc, docx, sheet)")
+		return commentDocRef{}, output.ErrValidation("--type is required when --doc is a bare token (allowed values: doc, docx, sheet, slides)")
 	}
 	return commentDocRef{Kind: docType, Token: raw}, nil
 }
@@ -385,9 +422,9 @@ func resolveCommentTarget(ctx context.Context, runtime *common.RuntimeContext, i
 		return resolvedCommentTarget{}, err
 	}
 
-	if docRef.Kind == "docx" || docRef.Kind == "doc" || docRef.Kind == "sheet" {
-		if mode == commentModeLocal && docRef.Kind != "docx" && docRef.Kind != "sheet" {
-			return resolvedCommentTarget{}, output.ErrValidation("local comments only support docx and sheet; old doc format only supports full comments")
+	if docRef.Kind == "docx" || docRef.Kind == "doc" || docRef.Kind == "sheet" || docRef.Kind == "slides" {
+		if mode == commentModeLocal && docRef.Kind != "docx" && docRef.Kind != "sheet" && docRef.Kind != "slides" {
+			return resolvedCommentTarget{}, output.ErrValidation("local comments only support docx, sheet, and slides; old doc format only supports full comments")
 		}
 		return resolvedCommentTarget{
 			DocID:      docRef.Token,
@@ -414,6 +451,12 @@ func resolveCommentTarget(ctx context.Context, runtime *common.RuntimeContext, i
 	if objType == "" || objToken == "" {
 		return resolvedCommentTarget{}, output.Errorf(output.ExitAPI, "api_error", "wiki get_node returned incomplete node data")
 	}
+	if objType == "slides" && mode == commentModeFull {
+		return resolvedCommentTarget{}, output.ErrValidation("wiki resolved to %q, but slide comments require --block-id <slide-block-type>!<xml-id>; --full-comment is not applicable", objType)
+	}
+	if objType == "slides" && strings.TrimSpace(runtime.Str("selection-with-ellipsis")) != "" {
+		return resolvedCommentTarget{}, output.ErrValidation("wiki resolved to %q, but --selection-with-ellipsis is not applicable for slide comments; use --block-id <slide-block-type>!<xml-id>", objType)
+	}
 	if objType == "sheet" {
 		// Sheet comments are handled via the sheet fast path in Execute.
 		fmt.Fprintf(runtime.IO().ErrOut, "Resolved wiki to %s: %s\n", objType, common.MaskToken(objToken))
@@ -425,11 +468,21 @@ func resolveCommentTarget(ctx context.Context, runtime *common.RuntimeContext, i
 			WikiToken:  docRef.Token,
 		}, nil
 	}
+	if objType == "slides" {
+		fmt.Fprintf(runtime.IO().ErrOut, "Resolved wiki to %s: %s\n", objType, common.MaskToken(objToken))
+		return resolvedCommentTarget{
+			DocID:      objToken,
+			FileToken:  objToken,
+			FileType:   "slides",
+			ResolvedBy: "wiki",
+			WikiToken:  docRef.Token,
+		}, nil
+	}
 	if mode == commentModeLocal && objType != "docx" {
-		return resolvedCommentTarget{}, output.ErrValidation("wiki resolved to %q, but local comments only support docx and sheet; for sheet use --block-id <sheetId>!<cell>", objType)
+		return resolvedCommentTarget{}, output.ErrValidation("wiki resolved to %q, but local comments only support docx, sheet, and slides; for sheet use --block-id <sheetId>!<cell>, for slides use --block-id <slide-block-type>!<xml-id>", objType)
 	}
 	if mode == commentModeFull && objType != "docx" && objType != "doc" {
-		return resolvedCommentTarget{}, output.ErrValidation("wiki resolved to %q, but comments only support doc/docx/sheet", objType)
+		return resolvedCommentTarget{}, output.ErrValidation("wiki resolved to %q, but comments only support doc/docx/sheet/slides", objType)
 	}
 
 	fmt.Fprintf(runtime.IO().ErrOut, "Resolved wiki to %s: %s\n", objType, common.MaskToken(objToken))
@@ -606,7 +659,7 @@ type sheetAnchor struct {
 	Row     int
 }
 
-func buildCommentCreateV2Request(fileType, blockID string, replyElements []map[string]interface{}, sheet *sheetAnchor) map[string]interface{} {
+func buildCommentCreateV2Request(fileType, blockID, slideBlockType string, replyElements []map[string]interface{}, sheet *sheetAnchor) map[string]interface{} {
 	body := map[string]interface{}{
 		"file_type":      fileType,
 		"reply_elements": replyElements,
@@ -621,6 +674,9 @@ func buildCommentCreateV2Request(fileType, blockID string, replyElements []map[s
 		body["anchor"] = map[string]interface{}{
 			"block_id": blockID,
 		}
+		if strings.TrimSpace(slideBlockType) != "" {
+			body["anchor"].(map[string]interface{})["slide_block_type"] = strings.TrimSpace(slideBlockType)
+		}
 	}
 	return body
 }
@@ -632,6 +688,24 @@ func anchorBlockIDForDryRun(blockID string) string {
 	return "<anchor_block_id>"
 }
 
+func parseSlidesBlockRef(blockID string) (string, string, error) {
+	blockID = strings.TrimSpace(blockID)
+	if blockID == "" {
+		return "", "", output.ErrValidation("slide comments require --block-id in <slide-block-type>!<xml-id> format")
+	}
+
+	parts := strings.SplitN(blockID, "!", 2)
+	if len(parts) != 2 {
+		return "", "", output.ErrValidation("slide --block-id must be <slide-block-type>!<xml-id> (e.g. shape!bPq), got %q", blockID)
+	}
+	parsedType := strings.TrimSpace(parts[0])
+	parsedID := strings.TrimSpace(parts[1])
+	if parsedType == "" || parsedID == "" {
+		return "", "", output.ErrValidation("slide --block-id must be <slide-block-type>!<xml-id> (e.g. shape!bPq), got %q", blockID)
+	}
+	return parsedID, parsedType, nil
+}
+
 func firstNonEmptyString(values ...string) string {
 	for _, value := range values {
 		if strings.TrimSpace(value) != "" {
@@ -703,7 +777,7 @@ func executeSheetComment(runtime *common.RuntimeContext, docRef commentDocRef) e
 	}
 
 	requestPath := fmt.Sprintf("/open-apis/drive/v1/files/%s/new_comments", validate.EncodePathSegment(docRef.Token))
-	requestBody := buildCommentCreateV2Request("sheet", "", replyElements, anchor)
+	requestBody := buildCommentCreateV2Request("sheet", "", "", replyElements, anchor)
 
 	fmt.Fprintf(runtime.IO().ErrOut, "Creating sheet comment in %s (sheet=%s, col=%d, row=%d)\n",
 		common.MaskToken(docRef.Token), anchor.SheetID, anchor.Col, anchor.Row)
@@ -727,6 +801,43 @@ func executeSheetComment(runtime *common.RuntimeContext, docRef commentDocRef) e
 	return nil
 }
 
+func executeSlidesComment(runtime *common.RuntimeContext, docRef commentDocRef) error {
+	replyElements, err := parseCommentReplyElements(runtime.Str("content"))
+	if err != nil {
+		return err
+	}
+
+	blockID, slideBlockType, err := parseSlidesBlockRef(runtime.Str("block-id"))
+	if err != nil {
+		return err
+	}
+
+	requestPath := fmt.Sprintf("/open-apis/drive/v1/files/%s/new_comments", validate.EncodePathSegment(docRef.Token))
+	requestBody := buildCommentCreateV2Request("slides", blockID, slideBlockType, replyElements, nil)
+
+	fmt.Fprintf(runtime.IO().ErrOut, "Creating slide block comment in %s (block_id=%s, slide_block_type=%s)\n",
+		common.MaskToken(docRef.Token), blockID, slideBlockType)
+
+	data, err := runtime.CallAPI("POST", requestPath, nil, requestBody)
+	if err != nil {
+		return err
+	}
+
+	out := map[string]interface{}{
+		"comment_id":       data["comment_id"],
+		"file_token":       docRef.Token,
+		"file_type":        "slides",
+		"comment_mode":     "slide_block",
+		"anchor_block_id":  blockID,
+		"slide_block_type": slideBlockType,
+	}
+	if createdAt := firstPresentValue(data, "created_at", "create_time"); createdAt != nil {
+		out["created_at"] = createdAt
+	}
+	runtime.Out(out, nil)
+	return nil
+}
+
 func extractURLToken(raw, marker string) (string, bool) {
 	idx := strings.Index(raw, marker)
 	if idx < 0 {