From 91e259bc398eb5a2b9d9a77a9d09759f29bb03a5 Mon Sep 17 00:00:00 2001
From: walker <13750528578@163.com>
Date: Wed, 22 Jul 2026 10:53:26 +0800
Subject: [PATCH] =?UTF-8?q?feat(xhs):=20=E8=A7=A3=E8=80=A6=E5=8E=9F?=
 =?UTF-8?q?=E5=88=9B=E4=B8=8E=20AI=20=E5=86=85=E5=AE=B9=E5=A3=B0=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/mark2note/main.go              | 24 +++++++++++++++---------
 cmd/mark2note/main_publish_test.go |  4 ++--
 cmd/mark2note/main_test.go         |  6 +++---
 configs/config.example.yaml        |  2 +-
 internal/app/service.go            |  2 ++
 internal/xhs/publisher.go          |  5 +----
 internal/xhs/publisher_test.go     | 20 +++++++++++++++++---
 internal/xhs/request.go            |  6 +-----
 internal/xhs/request_test.go       | 17 +++++++++++++++++
 9 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/cmd/mark2note/main.go b/cmd/mark2note/main.go
index bad5ee3..fc69243 100644
--- a/cmd/mark2note/main.go
+++ b/cmd/mark2note/main.go
@@ -95,6 +95,8 @@ Flags:
   --xhs-schedule-at <time>   override Xiaohongshu schedule time for --publish-xhs/--prepare-xhs (YYYY-MM-DD HH:MM:SS)
   --collection <name>        override Xiaohongshu collection for --publish-xhs/--prepare-xhs
   --declare-original         override Xiaohongshu original declaration for --publish-xhs/--prepare-xhs
+  --original-declaration-type <type>
+                            content type declaration: ai_generated; independent of --declare-original
   --import-photos            import generated PNG files into Apple Photos after export
   --import-album <name>      Apple Photos album name for imported PNG files
   --import-timeout <d>       Apple Photos PNG import timeout (default: 2m0s)
@@ -277,6 +279,7 @@ func parseOptions(args []string) (Options, error) {
 	fs.StringVar(&opts.XHSScheduleAt, "xhs-schedule-at", opts.XHSScheduleAt, "Xiaohongshu schedule time for auto publish")
 	fs.StringVar(&opts.XHSCollection, "collection", opts.XHSCollection, "Xiaohongshu collection name for auto publish")
 	fs.BoolVar(&opts.XHSDeclareOriginal, "declare-original", opts.XHSDeclareOriginal, "declare original content for auto publish")
+	fs.StringVar(&opts.XHSDeclarationType, "original-declaration-type", opts.XHSDeclarationType, "Xiaohongshu content declaration type for auto publish")
 	fs.BoolVar(&opts.ImportPhotos, "import-photos", opts.ImportPhotos, "import generated PNG files into Apple Photos after export")
 	fs.StringVar(&opts.ImportAlbum, "import-album", opts.ImportAlbum, "Apple Photos album name for imported PNG files")
 	fs.DurationVar(&opts.ImportTimeout, "import-timeout", opts.ImportTimeout, "Apple Photos PNG import timeout")
@@ -353,6 +356,7 @@ func parseOptions(args []string) (Options, error) {
 	xhsScheduleAtChanged := false
 	xhsCollectionChanged := false
 	xhsDeclareOriginalChanged := false
+	xhsOriginalDeclarationTypeChanged := false
 	xhsContentModeChanged := false
 	stopBeforeSubmitChanged := false
 	fs.Visit(func(f *flag.Flag) {
@@ -405,6 +409,8 @@ func parseOptions(args []string) (Options, error) {
 			xhsCollectionChanged = true
 		case "declare-original":
 			xhsDeclareOriginalChanged = true
+		case "original-declaration-type":
+			xhsOriginalDeclarationTypeChanged = true
 		case "stop-before-submit":
 			stopBeforeSubmitChanged = true
 		}
@@ -432,6 +438,7 @@ func parseOptions(args []string) (Options, error) {
 	opts.XHSScheduleAtChanged = xhsScheduleAtChanged
 	opts.XHSCollectionChanged = xhsCollectionChanged
 	opts.XHSDeclareOriginalChanged = xhsDeclareOriginalChanged
+	opts.XHSDeclarationTypeChanged = xhsOriginalDeclarationTypeChanged
 	opts.XHSContentModeChanged = xhsContentModeChanged
 	opts.StopBeforeSubmitChanged = stopBeforeSubmitChanged
 	if opts.XHSTagsChanged && !opts.PublishXHS && !opts.PrepareXHS {
@@ -446,6 +453,9 @@ func parseOptions(args []string) (Options, error) {
 	if opts.XHSDeclareOriginalChanged && !opts.PublishXHS && !opts.PrepareXHS {
 		return Options{}, fmt.Errorf("--declare-original requires --publish-xhs or --prepare-xhs\n\n%s", usageText())
 	}
+	if opts.XHSDeclarationTypeChanged && !opts.PublishXHS && !opts.PrepareXHS {
+		return Options{}, fmt.Errorf("--original-declaration-type requires --publish-xhs or --prepare-xhs\n\n%s", usageText())
+	}
 	if opts.XHSContentModeChanged && !opts.PublishXHS && !opts.PrepareXHS {
 		return Options{}, fmt.Errorf("--xhs-content-mode requires --publish-xhs or --prepare-xhs\n\n%s", usageText())
 	}
@@ -686,13 +696,9 @@ func validatePublishXHSOptions(opts app.PublishOptions) error {
 	if _, err := xhs.ValidateVisibility(opts.Visibility); err != nil {
 		return fmt.Errorf("--visibility: %w\n\n%s", err, publishXHSUsageText())
 	}
-	declarationType, err := xhs.ValidateOriginalDeclarationType(opts.OriginalDeclarationType)
-	if err != nil {
+	if _, err := xhs.ValidateOriginalDeclarationType(opts.OriginalDeclarationType); err != nil {
 		return fmt.Errorf("--original-declaration-type: %w\n\n%s", err, publishXHSUsageText())
 	}
-	if declarationType != "" && !opts.DeclareOriginal {
-		return fmt.Errorf("--original-declaration-type requires --declare-original=true\n\n%s", publishXHSUsageText())
-	}
 	if strings.TrimSpace(opts.Account) == "" {
 		return fmt.Errorf("--account is required\n\n%s", publishXHSUsageText())
 	}
@@ -945,10 +951,10 @@ func buildAutoPublishXHSOptions(renderOpts Options, renderResult app.Result) (ap
 	if renderOpts.XHSDeclareOriginalChanged {
 		cliOpts.DeclareOriginal = renderOpts.XHSDeclareOriginal
 		cliOpts.DeclareOriginalChanged = true
-		if !renderOpts.XHSDeclareOriginal {
-			cliOpts.OriginalDeclarationType = ""
-			cliOpts.OriginalDeclarationTypeChanged = true
-		}
+	}
+	if renderOpts.XHSDeclarationTypeChanged {
+		cliOpts.OriginalDeclarationType = strings.TrimSpace(renderOpts.XHSDeclarationType)
+		cliOpts.OriginalDeclarationTypeChanged = true
 	}
 	if renderOpts.StopBeforeSubmitChanged {
 		cliOpts.StopBeforeSubmit = renderOpts.StopBeforeSubmit
diff --git a/cmd/mark2note/main_publish_test.go b/cmd/mark2note/main_publish_test.go
index ead1a77..e360e1f 100644
--- a/cmd/mark2note/main_publish_test.go
+++ b/cmd/mark2note/main_publish_test.go
@@ -481,8 +481,8 @@ func TestBuildAutoPublishXHSOptionsCanDisableElectronicPicklesOriginality(t *tes
 	if err != nil {
 		t.Fatalf("buildAutoPublishXHSOptions() error = %v", err)
 	}
-	if got.DeclareOriginal || got.OriginalDeclarationType != "" {
-		t.Fatalf("originality flags = declare:%v type:%q, want disabled without declaration type", got.DeclareOriginal, got.OriginalDeclarationType)
+	if got.DeclareOriginal || got.OriginalDeclarationType != "ai_generated" {
+		t.Fatalf("originality flags = declare:%v type:%q, want original disabled with AI content declaration", got.DeclareOriginal, got.OriginalDeclarationType)
 	}
 }
 
diff --git a/cmd/mark2note/main_test.go b/cmd/mark2note/main_test.go
index df99522..70d9ba5 100644
--- a/cmd/mark2note/main_test.go
+++ b/cmd/mark2note/main_test.go
@@ -277,12 +277,12 @@ func TestParseOptionsParsesAutoPublishXHSFlags(t *testing.T) {
 }
 
 func TestParseOptionsParsesAutoPublishXHSDeclareOriginalOverride(t *testing.T) {
-	opts, err := parseOptions([]string{"--input", "article.md", "--publish-xhs", "--declare-original=false"})
+	opts, err := parseOptions([]string{"--input", "article.md", "--publish-xhs", "--declare-original=false", "--original-declaration-type=ai_generated"})
 	if err != nil {
 		t.Fatalf("parseOptions() error = %v", err)
 	}
-	if !opts.PublishXHS || !opts.XHSDeclareOriginalChanged || opts.XHSDeclareOriginal {
-		t.Fatalf("opts = %#v, want publish-xhs declare original false override", opts)
+	if !opts.PublishXHS || !opts.XHSDeclareOriginalChanged || opts.XHSDeclareOriginal || !opts.XHSDeclarationTypeChanged || opts.XHSDeclarationType != "ai_generated" {
+		t.Fatalf("opts = %#v, want original disabled with AI content declaration", opts)
 	}
 }
 
diff --git a/configs/config.example.yaml b/configs/config.example.yaml
index d6a9628..e168110 100644
--- a/configs/config.example.yaml
+++ b/configs/config.example.yaml
@@ -91,7 +91,7 @@ xhs:
     # 可选：加入已有小红书合集；留空则不选择合集。Optional existing Xiaohongshu collection name.
     collection: ""
     declare_original: true
-    # 可选：原创声明内容类型；留空则不选择。当前支持 ai_generated。
+    # 可选：内容类型声明；与 declare_original 独立。ai_generated 会选择“笔记含 AI 合成内容”。
     original_declaration_type: ""
     allow_content_copy: false
     topic_generation:
diff --git a/internal/app/service.go b/internal/app/service.go
index 17aa8a2..cd93bb4 100644
--- a/internal/app/service.go
+++ b/internal/app/service.go
@@ -71,6 +71,8 @@ type Options struct {
 	XHSCollectionChanged      bool
 	XHSDeclareOriginal        bool
 	XHSDeclareOriginalChanged bool
+	XHSDeclarationType        string
+	XHSDeclarationTypeChanged bool
 	XHSContentMode            string
 	XHSContentModeChanged     bool
 	Animated                  AnimatedOptions
diff --git a/internal/xhs/publisher.go b/internal/xhs/publisher.go
index 57b536f..cacce75 100644
--- a/internal/xhs/publisher.go
+++ b/internal/xhs/publisher.go
@@ -1485,10 +1485,7 @@ func isOriginalDeclarationNeedle(labelNeedle string) bool {
 }
 
 func (p *rodPage) applyOriginalDeclaration(enabled bool, declarationType string) error {
-	if !enabled {
-		return nil
-	}
-	if !p.isOriginalDeclared() {
+	if enabled && !p.isOriginalDeclared() {
 		if err := p.setCheckboxState("声明原创", true); err != nil {
 			if err := p.setCheckboxState("原创", true); err != nil {
 				if _, clickErr := p.clickVisibleNodeByText(".d-checkbox-main-label, .d-checkbox-label, .original-entry, div, span, label, button", "^声明原创$|^原创声明$|^原创$"); clickErr != nil {
diff --git a/internal/xhs/publisher_test.go b/internal/xhs/publisher_test.go
index 9c6ccb8..cfc25f4 100644
--- a/internal/xhs/publisher_test.go
+++ b/internal/xhs/publisher_test.go
@@ -554,7 +554,7 @@ func TestApplyCollectionSelectsMatchingCollection(t *testing.T) {
 	}
 }
 
-func TestApplyOriginalDeclarationSelectsAIGeneratedType(t *testing.T) {
+func TestApplyContentDeclarationWithoutOriginalSelectsAIGeneratedType(t *testing.T) {
 	page := testPage(t)
 
 	html := `<!doctype html>
@@ -565,7 +565,7 @@ func TestApplyOriginalDeclarationSelectsAIGeneratedType(t *testing.T) {
       <div class="custom-switch-wrapper">
         <div class="custom-switch-card">
           <span class="custom-switch-text-content">原创声明</span>
-          <input type="checkbox" checked>
+          <input type="checkbox">
         </div>
       </div>
       <div class="wrapper">
@@ -608,7 +608,7 @@ func TestApplyOriginalDeclarationSelectsAIGeneratedType(t *testing.T) {
 	page.MustElement("body")
 
 	rodPage := &rodPage{page: page}
-	if err := rodPage.applyOriginalDeclaration(true, "ai_generated"); err != nil {
+	if err := rodPage.applyOriginalDeclaration(false, "ai_generated"); err != nil {
 		state := page.MustEval(`() => document.body.innerText.replace(/\s+/g, ' ').trim()`).String()
 		t.Fatalf("applyOriginalDeclaration() error = %v, state = %s", err, state)
 	}
@@ -616,6 +616,9 @@ func TestApplyOriginalDeclarationSelectsAIGeneratedType(t *testing.T) {
 	if selected == nil || *selected != "笔记含AI生成内容" {
 		t.Fatalf("selected declaration type = %v, want 笔记含AI生成内容", selected)
 	}
+	if page.MustElement(`input[type="checkbox"]`).MustProperty("checked").Bool() {
+		t.Fatal("original declaration checkbox = checked, want unchanged false")
+	}
 	if trusted := page.MustEval(`() => window.declarationTriggerTrustedClickSeen === true`).Bool(); !trusted {
 		t.Fatal("declaration type select should open by a trusted click")
 	}
@@ -923,6 +926,17 @@ func TestPublisherOnlySelfStopBeforeSubmitAppliesPreSubmitHooks(t *testing.T) {
 	}
 }
 
+func TestPublisherOnlySelfStopBeforeSubmitKeepsAITypeWhenOriginalDisabled(t *testing.T) {
+	page := &fakePublishPage{}
+	request := PublishRequest{Title: "标题", Content: "正文", ImagePaths: []string{"cover.jpg"}, StopBeforeSubmit: true, DeclareOriginal: false, OriginalDeclarationType: "ai_generated"}
+	if err := (Publisher{}).PublishStandardOnlySelf(context.Background(), page, request); err != nil {
+		t.Fatalf("PublishStandardOnlySelf() error = %v", err)
+	}
+	if page.originalApplied || page.originalDeclarationType != "ai_generated" {
+		t.Fatalf("original declaration = %v, content declaration type = %q", page.originalApplied, page.originalDeclarationType)
+	}
+}
+
 func TestPublisherSetsScheduleTimeBeforeSubmit(t *testing.T) {
 	page := &fakePublishPage{}
 	scheduledAt := time.Date(2026, 4, 11, 20, 30, 0, 0, time.FixedZone("CST", 8*60*60))
diff --git a/internal/xhs/request.go b/internal/xhs/request.go
index 71858b1..6c6eb48 100644
--- a/internal/xhs/request.go
+++ b/internal/xhs/request.go
@@ -113,13 +113,9 @@ func (r PublishRequest) Validate(now time.Time) error {
 	if _, err := ValidateVisibility(string(r.Visibility)); err != nil {
 		return err
 	}
-	declarationType, err := ValidateOriginalDeclarationType(r.OriginalDeclarationType)
-	if err != nil {
+	if _, err := ValidateOriginalDeclarationType(r.OriginalDeclarationType); err != nil {
 		return err
 	}
-	if declarationType != "" && !r.DeclareOriginal {
-		return fmt.Errorf("original declaration type requires declare_original")
-	}
 	switch r.Mode {
 	case PublishModeImmediate:
 		if r.ScheduleTime != nil {
diff --git a/internal/xhs/request_test.go b/internal/xhs/request_test.go
index 477d7e5..3383111 100644
--- a/internal/xhs/request_test.go
+++ b/internal/xhs/request_test.go
@@ -100,6 +100,23 @@ func TestPublishRequestValidateAcceptsPublicVisibility(t *testing.T) {
 	}
 }
 
+func TestPublishRequestValidateAllowsContentDeclarationWithoutOriginal(t *testing.T) {
+	now := shanghaiTime(2026, 4, 10, 12, 0, 0)
+	request := PublishRequest{
+		Account:                 "creator-a",
+		Title:                   "标题",
+		Content:                 "正文",
+		Mode:                    PublishModeOnlySelf,
+		MediaKind:               MediaKindStandard,
+		ImagePaths:              []string{"cover.jpg"},
+		DeclareOriginal:         false,
+		OriginalDeclarationType: OriginalDeclarationTypeAIGenerated,
+	}
+	if err := request.Validate(now); err != nil {
+		t.Fatalf("Validate() error = %v", err)
+	}
+}
+
 func TestPublishRequestValidateRejectsInvalidVisibility(t *testing.T) {
 	request := PublishRequest{Account: "creator-a", Title: "标题", Content: "正文", Mode: PublishModeOnlySelf, Visibility: PublishVisibility("friends"), MediaKind: MediaKindStandard, ImagePaths: []string{"cover.jpg"}}
 	if err := request.Validate(shanghaiTime(2026, 4, 10, 12, 0, 0)); err == nil || !strings.Contains(err.Error(), "visibility must be public or only-self") {