From 8b30e72c7f7b24b55845f2db8346721c6444c42e Mon Sep 17 00:00:00 2001
From: walker <13750528578@163.com>
Date: Sun, 7 Jun 2026 02:59:43 +0800
Subject: [PATCH] =?UTF-8?q?feat(xhs):=20=E6=94=AF=E6=8C=81=E6=96=B0?=
 =?UTF-8?q?=E9=97=BB=E5=9B=BE=E6=96=87=E5=8D=A1=E5=90=88=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.en.md                                  |  14 +-
 README.zh-CN.md                               |  10 +-
 cmd/mark2note/main.go                         | 221 +++++---
 cmd/mark2note/main_publish_test.go            | 277 +++++++---
 cmd/mark2note/main_test.go                    |  32 +-
 configs/config.example.yaml                   |  13 +-
 internal/ai/deck_builder.go                   |  11 +-
 internal/ai/deck_builder_test.go              |  27 +-
 internal/app/publish_service.go               |  68 ++-
 internal/app/publish_service_test.go          |  36 +-
 internal/app/service.go                       |  65 +++
 internal/app/service_test.go                  |  34 ++
 internal/config/config.go                     |  59 +-
 internal/config/config_test.go                |  85 ++-
 internal/deck/deck.go                         |  50 +-
 internal/deck/deck_test.go                    |  38 +-
 internal/render/animated.go                   |   7 +
 internal/render/animated_test.go              |   2 +-
 internal/render/assets/base.css               |  87 ++-
 internal/render/assets/page.tmpl              |  21 +-
 internal/render/template.go                   |   5 +
 internal/render/template_test.go              | 262 +++++----
 .../fixtures/default-all-variants.json        |  52 +-
 .../fixtures/default-semantic-highlight.json  |   8 +-
 .../fixtures/editorial-cool-all-variants.json |  52 +-
 .../editorial-cool-semantic-highlight.json    |   8 +-
 .../fixtures/fresh-green-all-variants.json    |  52 +-
 .../fixtures/plum-ink-all-variants.json       |  52 +-
 .../fixtures/sage-mist-all-variants.json      |  52 +-
 .../fixtures/tech-noir-all-variants.json      |  52 +-
 .../tech-noir-semantic-highlight.json         |   8 +-
 .../fixtures/warm-paper-all-variants.json     |  52 +-
 .../warm-paper-semantic-highlight.json        |   8 +-
 .../golden-html/default-all-variants.sha256   |   2 +-
 .../golden-html/default-author-global.sha256  |   2 +-
 .../golden-html/default-author-long.sha256    |   2 +-
 .../golden-html/default-author-none.sha256    |   2 +-
 .../default-author-override.sha256            |   2 +-
 .../default-semantic-highlight.sha256         |   2 +-
 .../editorial-cool-all-variants.sha256        |   2 +-
 .../editorial-cool-semantic-highlight.sha256  |   2 +-
 .../fresh-green-all-variants.sha256           |   2 +-
 .../golden-html/plum-ink-all-variants.sha256  |   2 +-
 .../golden-html/sage-mist-all-variants.sha256 |   2 +-
 .../golden-html/tech-noir-all-variants.sha256 |   2 +-
 .../tech-noir-semantic-highlight.sha256       |   2 +-
 .../warm-paper-all-variants.sha256            |   2 +-
 .../warm-paper-semantic-highlight.sha256      |   2 +-
 internal/xhs/publisher.go                     | 514 +++++++++++++++++-
 internal/xhs/publisher_test.go                | 482 ++++++++++++++--
 internal/xhs/request.go                       |  83 ++-
 internal/xhs/request_test.go                  |  66 ++-
 52 files changed, 2423 insertions(+), 572 deletions(-)

diff --git a/README.en.md b/README.en.md
index c50e9fd..55ce665 100644
--- a/README.en.md
+++ b/README.en.md
@@ -196,7 +196,8 @@ Key fields:
 - `xhs.publish.headless`: default browser headless mode for `publish-xhs`, `--publish-xhs`, and `--prepare-xhs`
 - `xhs.publish.browser_path`: default browser executable path for `publish-xhs`, `--publish-xhs`, and `--prepare-xhs`; CLI `--chrome` can override it for one run
 - `xhs.publish.profile_dir`: default browser profile directory for `publish-xhs`, `--publish-xhs`, and `--prepare-xhs`
-- `xhs.publish.mode`: default publish mode for `publish-xhs`, `--publish-xhs`, and `--prepare-xhs`, supporting `only-self` and `schedule`; main render commands can override it for one run with `--xhs-mode`
+- `xhs.publish.mode`: publish timing/flow, not page visibility; supports `immediate` (normal immediate publish flow) and `schedule` (scheduled publish flow); main render commands can override it for one run with `--xhs-mode`
+- `xhs.publish.visibility`: Xiaohongshu page visibility, not publish timing; supports `public` and `only-self`
 - `xhs.publish.schedule_at`: default scheduled publish time for `mode: schedule`, using `YYYY-MM-DD HH:MM:SS` and parsed in Asia/Shanghai; main render commands can override it for one run with `--xhs-schedule-at`
 - `xhs.publish.topic_generation.enabled`: whether `--publish-xhs` / `--prepare-xhs` calls AI to generate 3-6 Xiaohongshu topics when `--xhs-tags` is omitted, on by default
 - `xhs.publish.title_generation.enabled`: whether `--publish-xhs` / `--prepare-xhs` calls AI to rewrite titles that exceed `max_runes`, on by default
@@ -357,8 +358,8 @@ Rules:
 
 Current behavior:
 
-- standard publish mode currently submits as only-self-visible
-- schedule mode still submits as scheduled publish
+- `immediate` mode uses the normal publish flow; page visibility is controlled separately by `visibility`
+- `schedule` mode submits a scheduled publish
 - media source is exclusive: use `--images` for standard image posts or `--live-report` for the Live pipeline
 
 ### Usage
@@ -379,7 +380,7 @@ mark2note publish-xhs --help
 - `--content <text>`: inline content text; exactly one of `--content` / `--content-file` is required
 - `--content-file <file>`: content file path
 - `--tags <csv>`: comma-separated tags
-- `--mode <name>`: publish mode, supporting `only-self` and `schedule`; when omitted it falls back to `xhs.publish.mode`, otherwise defaults to `only-self`
+- `--mode <name>`: publish timing/flow, supporting `immediate` and `schedule`; when omitted it falls back to `xhs.publish.mode`, otherwise defaults to `immediate`
 - `--schedule-at <time>`: scheduled publish time in `YYYY-MM-DD HH:MM:SS`, parsed in Asia/Shanghai; when omitted it can fall back to `xhs.publish.schedule_at`
 - `--images <csv>`: comma-separated image paths for standard image posts
 - `--live-report <file>`: Live delivery report path used to resolve publishable Live assets
@@ -420,7 +421,10 @@ xhs:
     headless: false
     browser_path: /Applications/Google Chrome.app/Contents/MacOS/Google Chrome
     profile_dir: ~/.config/mark2note/xhs/profiles/walker
-    mode: only-self
+    # mode controls publish timing/flow; values: immediate = normal immediate flow, schedule = scheduled flow.
+    mode: immediate
+    # visibility controls page visibility; values: public = public, only-self = visible only to yourself.
+    visibility: public
     schedule_at: ""
 ```
 
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 09cd276..cd299fa 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -196,7 +196,8 @@ posters:
 - `xhs.publish.headless`：`publish-xhs`、`--publish-xhs` 和 `--prepare-xhs` 默认是否无头运行浏览器
 - `xhs.publish.browser_path`：`publish-xhs`、`--publish-xhs` 和 `--prepare-xhs` 默认浏览器可执行文件路径；命令行 `--chrome` 可单次覆盖
 - `xhs.publish.profile_dir`：`publish-xhs`、`--publish-xhs` 和 `--prepare-xhs` 默认浏览器 profile 目录
-- `xhs.publish.mode`：`publish-xhs`、`--publish-xhs` 和 `--prepare-xhs` 默认发布模式，支持 `only-self`、`schedule`；主渲染命令可用 `--xhs-mode` 单次覆盖
+- `xhs.publish.mode`：发布时机/流程，不控制页面可见性；支持 `immediate`（普通立即发布流程）和 `schedule`（定时发布流程）；主渲染命令可用 `--xhs-mode` 单次覆盖
+- `xhs.publish.visibility`：小红书页面可见性，不控制发布时机；支持 `public`（公开可见）和 `only-self`（仅自己可见）
 - `xhs.publish.schedule_at`：`mode: schedule` 时的默认定时发布时间，格式 `YYYY-MM-DD HH:MM:SS`，按 Asia/Shanghai 解析；主渲染命令可用 `--xhs-schedule-at` 单次覆盖
 - `xhs.publish.topic_generation.enabled`：`--publish-xhs` / `--prepare-xhs` 未传 `--xhs-tags` 时是否调用 AI 生成 3-6 个小红书话题，默认开启
 - `xhs.publish.title_generation.enabled`：`--publish-xhs` / `--prepare-xhs` 标题超过 `max_runes` 时是否调用 AI 改写标题，默认开启
@@ -380,7 +381,7 @@ mark2note publish-xhs --help
 - `--content <text>`：直接传正文；与 `--content-file` 二选一；如果提供了 `--tags`，正文可以省略
 - `--content-file <file>`：从文件读取正文；与 `--content` 二选一
 - `--tags <csv>`：逗号分隔标签列表
-- `--mode <name>`：发布模式，支持 `only-self`、`schedule`；未显式传入时，回退到 `xhs.publish.mode`，否则默认 `only-self`
+- `--mode <name>`：发布时机/流程，支持 `immediate`、`schedule`；未显式传入时，回退到 `xhs.publish.mode`，否则默认 `immediate`
 - `--schedule-at <time>`：定时发布时间，格式 `YYYY-MM-DD HH:MM:SS`，按 Asia/Shanghai 解析；未显式传入时可回退到 `xhs.publish.schedule_at`
 - `--images <csv>`：逗号分隔图片路径列表，用于普通图文发布
 - `--live-report <file>`：Live 交付报告路径，用于从 Live 导出结果里提取可发布素材
@@ -421,7 +422,10 @@ xhs:
     headless: false
     browser_path: /Applications/Google Chrome.app/Contents/MacOS/Google Chrome
     profile_dir: ~/.config/mark2note/xhs/profiles/walker
-    mode: only-self
+    # mode 控制发布时机/流程；可选值：immediate = 普通立即发布流程，schedule = 定时发布流程。
+    mode: immediate
+    # visibility 控制页面可见性；可选值：public = 公开可见，only-self = 仅自己可见。
+    visibility: public
     schedule_at: ""
 ```
 
diff --git a/cmd/mark2note/main.go b/cmd/mark2note/main.go
index 152f5bb..e6afe63 100644
--- a/cmd/mark2note/main.go
+++ b/cmd/mark2note/main.go
@@ -63,7 +63,7 @@ Usage:
 Commands:
   capture-html    capture existing html file(s) to sibling png files
   enrich-posters  search poster candidates and write a posters.yaml manifest
-  publish-xhs     publish assets to Xiaohongshu only-self-visible or schedule queue
+  publish-xhs     publish assets to Xiaohongshu immediate or scheduled queue
 
 Flags:
   --input <file.md>          markdown input path
@@ -79,9 +79,11 @@ Flags:
   --auto-posters             automatically search poster candidates and hydrate cover cards
   --poster-sources <csv>     poster providers for --auto-posters (default: bilibili,bangumi,anilist,mydramalist)
   --publish-xhs              publish generated PNG files to Xiaohongshu after render
+  --stop-before-submit       for --publish-xhs, prepare Xiaohongshu editor then stop before final submit
   --prepare-xhs              generate Xiaohongshu publish metadata after render without publishing
   --xhs-tags <csv>           override auto-generated Xiaohongshu topics for --publish-xhs/--prepare-xhs
-  --xhs-mode <mode>          override Xiaohongshu mode for --publish-xhs/--prepare-xhs (only-self or schedule)
+  --xhs-mode <mode>          override Xiaohongshu publish timing mode for --publish-xhs/--prepare-xhs (immediate or schedule)
+  --xhs-visibility <name>    override Xiaohongshu visibility for --publish-xhs/--prepare-xhs (public or only-self)
   --xhs-schedule-at <time>   override Xiaohongshu schedule time for --publish-xhs/--prepare-xhs (YYYY-MM-DD HH:MM:SS)
   --import-photos            import generated PNG files into Apple Photos after export
   --import-album <name>      Apple Photos album name for imported PNG files
@@ -180,7 +182,7 @@ Examples:
 func publishXHSUsageText() string {
 	return `mark2note publish-xhs
 
-Publish generated assets to Xiaohongshu only-self-visible or schedule queue.
+Publish generated assets to Xiaohongshu immediate or scheduled queue.
 
 Usage:
   mark2note publish-xhs --account <name> [flags]
@@ -189,15 +191,17 @@ Usage:
 
 Flags:
   --config <file>          config file path (default: configs/config.yaml)
-  --meta <file>            replay publish options from xhs-publish-meta.json; cannot be combined with manual publish fields
+  --meta <file>            replay publish options from xhs-publish-meta.json; can only be combined with --stop-before-submit
   --account <name>         publish account/profile target (default from xhs.publish.account)
   --title <text>           inline title text (exactly one of --title / --title-file)
   --title-file <file>      title file path
   --content <text>         inline content text (exactly one of --content / --content-file)
   --content-file <file>    content file path
   --tags <csv>             comma-separated tags
-  --mode <name>            publish mode: only-self or schedule (default from xhs.publish.mode or only-self)
+  --mode <name>            publish timing mode: immediate or schedule (default from xhs.publish.mode or immediate)
+  --visibility <name>      visibility: public or only-self (default from xhs.publish.visibility or only-self)
   --schedule-at <time>     schedule time in YYYY-MM-DD HH:MM:SS (Asia/Shanghai; default from xhs.publish.schedule_at)
+  --collection <name>      Xiaohongshu collection name (default from xhs.publish.collection)
   --images <csv>           comma-separated image paths
   --live-report <file>     live delivery report path
   --live-pages <csv>       ordered live page subset; requires --live-report
@@ -205,11 +209,13 @@ Flags:
   --headless               run browser automation headless (default: true; xhs.publish.headless can override)
   --profile-dir <dir>      browser profile directory (default from xhs.publish.profile_dir)
   --declare-original       declare original content before submit (default from xhs.publish.declare_original)
+  --original-declaration-type <type>
+                           original declaration content type: ai_generated (default from xhs.publish.original_declaration_type)
   --allow-content-copy     keep allow content copy enabled (default from xhs.publish.allow_content_copy)
   --stop-before-submit     prepare the Xiaohongshu editor, then stop before final submit; use --headless=false for manual inspection
 
 Rules:
-  - --meta replays persisted metadata and must be used standalone
+  - --meta replays persisted metadata; only --stop-before-submit may be combined with it
   - without --meta, exactly one of --title / --title-file is required
   - without --meta, content may come from --content / --content-file or be omitted when --tags are provided
   - exactly one media source is required: --images or --live-report
@@ -240,9 +246,11 @@ func parseOptions(args []string) (Options, error) {
 	fs.BoolVar(&opts.AutoPosters, "auto-posters", opts.AutoPosters, "automatically search poster candidates and hydrate cover cards")
 	fs.StringVar(&posterSources, "poster-sources", posterSources, "comma-separated poster providers for --auto-posters")
 	fs.BoolVar(&opts.PublishXHS, "publish-xhs", opts.PublishXHS, "publish generated PNG files to Xiaohongshu after render")
+	fs.BoolVar(&opts.StopBeforeSubmit, "stop-before-submit", opts.StopBeforeSubmit, "prepare XHS editor then stop before final submit")
 	fs.BoolVar(&opts.PrepareXHS, "prepare-xhs", opts.PrepareXHS, "generate Xiaohongshu publish metadata after render without publishing")
 	fs.StringVar(&xhsTags, "xhs-tags", xhsTags, "comma-separated Xiaohongshu topics for auto publish")
 	fs.StringVar(&opts.XHSMode, "xhs-mode", opts.XHSMode, "Xiaohongshu publish mode for auto publish")
+	fs.StringVar(&opts.XHSVisibility, "xhs-visibility", opts.XHSVisibility, "Xiaohongshu visibility for auto publish")
 	fs.StringVar(&opts.XHSScheduleAt, "xhs-schedule-at", opts.XHSScheduleAt, "Xiaohongshu schedule time 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")
@@ -313,7 +321,9 @@ func parseOptions(args []string) (Options, error) {
 	chromePathChanged := false
 	xhsTagsChanged := false
 	xhsModeChanged := false
+	xhsVisibilityChanged := false
 	xhsScheduleAtChanged := false
+	stopBeforeSubmitChanged := false
 	fs.Visit(func(f *flag.Flag) {
 		switch f.Name {
 		case "out":
@@ -354,8 +364,12 @@ func parseOptions(args []string) (Options, error) {
 			xhsTagsChanged = true
 		case "xhs-mode":
 			xhsModeChanged = true
+		case "xhs-visibility":
+			xhsVisibilityChanged = true
 		case "xhs-schedule-at":
 			xhsScheduleAtChanged = true
+		case "stop-before-submit":
+			stopBeforeSubmitChanged = true
 		}
 	})
 	opts.OutDirChanged = outChanged
@@ -377,12 +391,17 @@ func parseOptions(args []string) (Options, error) {
 	opts.LiveImportTimeoutChanged = liveImportTimeoutChanged
 	opts.XHSTagsChanged = xhsTagsChanged
 	opts.XHSModeChanged = xhsModeChanged
+	opts.XHSVisibilityChanged = xhsVisibilityChanged
 	opts.XHSScheduleAtChanged = xhsScheduleAtChanged
+	opts.StopBeforeSubmitChanged = stopBeforeSubmitChanged
 	if opts.XHSTagsChanged && !opts.PublishXHS && !opts.PrepareXHS {
 		return Options{}, fmt.Errorf("--xhs-tags requires --publish-xhs or --prepare-xhs\n\n%s", usageText())
 	}
-	if (opts.XHSModeChanged || opts.XHSScheduleAtChanged) && !opts.PublishXHS && !opts.PrepareXHS {
-		return Options{}, fmt.Errorf("--xhs-mode/--xhs-schedule-at require --publish-xhs or --prepare-xhs\n\n%s", usageText())
+	if (opts.XHSModeChanged || opts.XHSVisibilityChanged || opts.XHSScheduleAtChanged) && !opts.PublishXHS && !opts.PrepareXHS {
+		return Options{}, fmt.Errorf("--xhs-mode/--xhs-visibility/--xhs-schedule-at require --publish-xhs or --prepare-xhs\n\n%s", usageText())
+	}
+	if opts.StopBeforeSubmitChanged && !opts.PublishXHS {
+		return Options{}, fmt.Errorf("--stop-before-submit requires --publish-xhs\n\n%s", usageText())
 	}
 	if opts.XHSModeChanged {
 		mode, err := xhs.ValidateMode(opts.XHSMode)
@@ -391,6 +410,13 @@ func parseOptions(args []string) (Options, error) {
 		}
 		opts.XHSMode = string(mode)
 	}
+	if opts.XHSVisibilityChanged {
+		visibility, err := xhs.ValidateVisibility(opts.XHSVisibility)
+		if err != nil {
+			return Options{}, fmt.Errorf("--xhs-visibility: %w\n\n%s", err, usageText())
+		}
+		opts.XHSVisibility = string(visibility)
+	}
 	return opts, nil
 }
 
@@ -452,17 +478,20 @@ func parseCaptureHTMLOptions(args []string) (Options, error) {
 type publishXHSCLIOptions struct {
 	app.PublishOptions
 
-	ConfigPath              string
-	MetaPath                string
-	ConfigPathChanged       bool
-	AccountChanged          bool
-	HeadlessChanged         bool
-	ChromePathChanged       bool
-	ProfileDirChanged       bool
-	ModeChanged             bool
-	DeclareOriginalChanged  bool
-	AllowContentCopyChanged bool
-	MetaConflictFlags       []string
+	ConfigPath                     string
+	MetaPath                       string
+	ConfigPathChanged              bool
+	AccountChanged                 bool
+	HeadlessChanged                bool
+	ChromePathChanged              bool
+	ProfileDirChanged              bool
+	ModeChanged                    bool
+	VisibilityChanged              bool
+	CollectionChanged              bool
+	DeclareOriginalChanged         bool
+	OriginalDeclarationTypeChanged bool
+	AllowContentCopyChanged        bool
+	MetaConflictFlags              []string
 }
 
 func parsePublishXHSOptions(args []string) (publishXHSCLIOptions, error) {
@@ -471,6 +500,7 @@ func parsePublishXHSOptions(args []string) (publishXHSCLIOptions, error) {
 			ChromePath: defaultOptions().ChromePath,
 			Headless:   true,
 			Mode:       string(xhs.PublishModeOnlySelf),
+			Visibility: string(xhs.PublishVisibilityOnlySelf),
 		},
 		ConfigPath: defaultOptions().ConfigPath,
 	}
@@ -487,8 +517,10 @@ func parsePublishXHSOptions(args []string) (publishXHSCLIOptions, error) {
 	fs.StringVar(&opts.Content, "content", opts.Content, "inline content text")
 	fs.StringVar(&opts.ContentFile, "content-file", opts.ContentFile, "content file path")
 	fs.StringVar(&tags, "tags", tags, "comma-separated tags")
-	fs.StringVar(&opts.Mode, "mode", opts.Mode, "publish mode")
+	fs.StringVar(&opts.Mode, "mode", opts.Mode, "publish timing mode")
+	fs.StringVar(&opts.Visibility, "visibility", opts.Visibility, "publish visibility")
 	fs.StringVar(&opts.ScheduleAt, "schedule-at", opts.ScheduleAt, "schedule time")
+	fs.StringVar(&opts.Collection, "collection", opts.Collection, "Xiaohongshu collection name")
 	fs.StringVar(&images, "images", images, "comma-separated image paths")
 	fs.StringVar(&opts.LiveReportPath, "live-report", opts.LiveReportPath, "live delivery report path")
 	fs.StringVar(&livePages, "live-pages", livePages, "ordered live page subset")
@@ -496,6 +528,7 @@ func parsePublishXHSOptions(args []string) (publishXHSCLIOptions, error) {
 	fs.BoolVar(&opts.Headless, "headless", opts.Headless, "run browser automation headless")
 	fs.StringVar(&opts.ProfileDir, "profile-dir", opts.ProfileDir, "browser profile directory")
 	fs.BoolVar(&opts.DeclareOriginal, "declare-original", opts.DeclareOriginal, "declare original content before submit")
+	fs.StringVar(&opts.OriginalDeclarationType, "original-declaration-type", opts.OriginalDeclarationType, "original declaration content type")
 	fs.BoolVar(&opts.AllowContentCopy, "allow-content-copy", opts.AllowContentCopy, "leave allow content copy enabled")
 	fs.BoolVar(&opts.StopBeforeSubmit, "stop-before-submit", opts.StopBeforeSubmit, "prepare editor then stop before final submit")
 
@@ -509,7 +542,7 @@ func parsePublishXHSOptions(args []string) (publishXHSCLIOptions, error) {
 	opts.ImagePaths = splitCSV(images)
 	opts.LivePages = splitCSV(livePages)
 	fs.Visit(func(f *flag.Flag) {
-		if f.Name != "meta" {
+		if f.Name != "meta" && f.Name != "stop-before-submit" {
 			opts.MetaConflictFlags = append(opts.MetaConflictFlags, "--"+f.Name)
 		}
 		switch f.Name {
@@ -525,8 +558,14 @@ func parsePublishXHSOptions(args []string) (publishXHSCLIOptions, error) {
 			opts.ProfileDirChanged = true
 		case "mode":
 			opts.ModeChanged = true
+		case "visibility":
+			opts.VisibilityChanged = true
+		case "collection":
+			opts.CollectionChanged = true
 		case "declare-original":
 			opts.DeclareOriginalChanged = true
+		case "original-declaration-type":
+			opts.OriginalDeclarationTypeChanged = true
 		case "allow-content-copy":
 			opts.AllowContentCopyChanged = true
 		}
@@ -563,12 +602,21 @@ func mergePublishXHSDefaults(cli publishXHSCLIOptions, cfg *config.Config) app.P
 	if !cli.ModeChanged && strings.TrimSpace(defaults.Mode) != "" {
 		opts.Mode = strings.TrimSpace(defaults.Mode)
 	}
+	if !cli.VisibilityChanged && strings.TrimSpace(defaults.Visibility) != "" {
+		opts.Visibility = strings.TrimSpace(defaults.Visibility)
+	}
 	if strings.TrimSpace(opts.Mode) == string(xhs.PublishModeSchedule) && strings.TrimSpace(opts.ScheduleAt) == "" && strings.TrimSpace(defaults.ScheduleAt) != "" {
 		opts.ScheduleAt = strings.TrimSpace(defaults.ScheduleAt)
 	}
+	if !cli.CollectionChanged && strings.TrimSpace(opts.Collection) == "" {
+		opts.Collection = strings.TrimSpace(defaults.Collection)
+	}
 	if !cli.DeclareOriginalChanged && defaults.DeclareOriginal != nil {
 		opts.DeclareOriginal = *defaults.DeclareOriginal
 	}
+	if !cli.OriginalDeclarationTypeChanged && strings.TrimSpace(opts.OriginalDeclarationType) == "" {
+		opts.OriginalDeclarationType = strings.TrimSpace(defaults.OriginalDeclarationType)
+	}
 	if !cli.AllowContentCopyChanged && defaults.AllowContentCopy != nil {
 		opts.AllowContentCopy = *defaults.AllowContentCopy
 	}
@@ -579,6 +627,16 @@ func mergePublishXHSDefaults(cli publishXHSCLIOptions, cfg *config.Config) app.P
 }
 
 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 {
+		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())
 	}
@@ -753,6 +811,7 @@ func buildAutoPublishXHSOptions(renderOpts Options, renderResult app.Result) (ap
 		PublishOptions: app.PublishOptions{
 			Title:      title,
 			Mode:       string(xhs.PublishModeOnlySelf),
+			Visibility: string(xhs.PublishVisibilityOnlySelf),
 			ImagePaths: imagePaths,
 			ChromePath: renderOpts.ChromePath,
 			Headless:   true,
@@ -778,9 +837,16 @@ func buildAutoPublishXHSOptions(renderOpts Options, renderResult app.Result) (ap
 		cliOpts.Mode = strings.TrimSpace(renderOpts.XHSMode)
 		cliOpts.ModeChanged = true
 	}
+	if renderOpts.XHSVisibilityChanged {
+		cliOpts.Visibility = strings.TrimSpace(renderOpts.XHSVisibility)
+		cliOpts.VisibilityChanged = true
+	}
 	if renderOpts.XHSScheduleAtChanged {
 		cliOpts.ScheduleAt = strings.TrimSpace(renderOpts.XHSScheduleAt)
 	}
+	if renderOpts.StopBeforeSubmitChanged {
+		cliOpts.StopBeforeSubmit = renderOpts.StopBeforeSubmit
+	}
 	publishOpts := mergePublishXHSDefaults(cliOpts, cfg)
 	if err := validatePublishXHSOptions(publishOpts); err != nil {
 		return app.PublishOptions{}, err
@@ -848,22 +914,25 @@ func buildAutoPublishXHSTopics(cfg config.Config, markdown string, title string,
 }
 
 type xhsPublishMeta struct {
-	Title            string   `json:"title"`
-	Content          string   `json:"content"`
-	Tags             []string `json:"tags"`
-	Images           []string `json:"images"`
-	Account          string   `json:"account"`
-	Mode             string   `json:"mode"`
-	ScheduleAt       string   `json:"schedule_at,omitempty"`
-	ChromePath       string   `json:"chrome_path"`
-	Headless         bool     `json:"headless"`
-	ProfileDir       string   `json:"profile_dir"`
-	DeclareOriginal  bool     `json:"declare_original"`
-	AllowContentCopy bool     `json:"allow_content_copy"`
-	InputPath        string   `json:"input_path"`
-	ConfigPath       string   `json:"config_path"`
-	GeneratedAt      string   `json:"generated_at"`
-	ChromeArgs       []string `json:"chrome_args,omitempty"`
+	Title                   string   `json:"title"`
+	Content                 string   `json:"content"`
+	Tags                    []string `json:"tags"`
+	Images                  []string `json:"images"`
+	Account                 string   `json:"account"`
+	Mode                    string   `json:"mode"`
+	Visibility              string   `json:"visibility,omitempty"`
+	ScheduleAt              string   `json:"schedule_at,omitempty"`
+	Collection              string   `json:"collection,omitempty"`
+	ChromePath              string   `json:"chrome_path"`
+	Headless                bool     `json:"headless"`
+	ProfileDir              string   `json:"profile_dir"`
+	DeclareOriginal         bool     `json:"declare_original"`
+	OriginalDeclarationType string   `json:"original_declaration_type,omitempty"`
+	AllowContentCopy        bool     `json:"allow_content_copy"`
+	InputPath               string   `json:"input_path"`
+	ConfigPath              string   `json:"config_path"`
+	GeneratedAt             string   `json:"generated_at"`
+	ChromeArgs              []string `json:"chrome_args,omitempty"`
 }
 
 func xhsPublishMetaPath(renderResult app.Result) string {
@@ -880,22 +949,25 @@ func writeAutoPublishXHSMeta(renderOpts Options, renderResult app.Result, publis
 		return nil
 	}
 	meta := xhsPublishMeta{
-		Title:            publishOpts.Title,
-		Content:          publishOpts.Content,
-		Tags:             publishOpts.Tags,
-		Images:           publishOpts.ImagePaths,
-		Account:          publishOpts.Account,
-		Mode:             publishOpts.Mode,
-		ScheduleAt:       publishOpts.ScheduleAt,
-		ChromePath:       publishOpts.ChromePath,
-		Headless:         publishOpts.Headless,
-		ProfileDir:       publishOpts.ProfileDir,
-		DeclareOriginal:  publishOpts.DeclareOriginal,
-		AllowContentCopy: publishOpts.AllowContentCopy,
-		InputPath:        renderOpts.InputPath,
-		ConfigPath:       renderOpts.ConfigPath,
-		GeneratedAt:      nowFunc().Format(time.RFC3339),
-		ChromeArgs:       publishOpts.ChromeArgs,
+		Title:                   publishOpts.Title,
+		Content:                 publishOpts.Content,
+		Tags:                    publishOpts.Tags,
+		Images:                  publishOpts.ImagePaths,
+		Account:                 publishOpts.Account,
+		Mode:                    publishOpts.Mode,
+		Visibility:              publishOpts.Visibility,
+		ScheduleAt:              publishOpts.ScheduleAt,
+		Collection:              publishOpts.Collection,
+		ChromePath:              publishOpts.ChromePath,
+		Headless:                publishOpts.Headless,
+		ProfileDir:              publishOpts.ProfileDir,
+		DeclareOriginal:         publishOpts.DeclareOriginal,
+		OriginalDeclarationType: publishOpts.OriginalDeclarationType,
+		AllowContentCopy:        publishOpts.AllowContentCopy,
+		InputPath:               renderOpts.InputPath,
+		ConfigPath:              renderOpts.ConfigPath,
+		GeneratedAt:             nowFunc().Format(time.RFC3339),
+		ChromeArgs:              publishOpts.ChromeArgs,
 	}
 	data, err := json.MarshalIndent(meta, "", "  ")
 	if err != nil {
@@ -919,19 +991,22 @@ func readXHSPublishMeta(path string) (app.PublishOptions, error) {
 		return app.PublishOptions{}, err
 	}
 	return app.PublishOptions{
-		Account:          meta.Account,
-		Title:            meta.Title,
-		Content:          meta.Content,
-		Tags:             append([]string(nil), meta.Tags...),
-		Mode:             meta.Mode,
-		ScheduleAt:       meta.ScheduleAt,
-		ImagePaths:       append([]string(nil), meta.Images...),
-		ChromePath:       meta.ChromePath,
-		Headless:         meta.Headless,
-		ProfileDir:       meta.ProfileDir,
-		ChromeArgs:       append([]string(nil), meta.ChromeArgs...),
-		DeclareOriginal:  meta.DeclareOriginal,
-		AllowContentCopy: meta.AllowContentCopy,
+		Account:                 meta.Account,
+		Title:                   meta.Title,
+		Content:                 meta.Content,
+		Tags:                    append([]string(nil), meta.Tags...),
+		Mode:                    meta.Mode,
+		Visibility:              meta.Visibility,
+		ScheduleAt:              meta.ScheduleAt,
+		Collection:              meta.Collection,
+		ImagePaths:              append([]string(nil), meta.Images...),
+		ChromePath:              meta.ChromePath,
+		Headless:                meta.Headless,
+		ProfileDir:              meta.ProfileDir,
+		ChromeArgs:              append([]string(nil), meta.ChromeArgs...),
+		DeclareOriginal:         meta.DeclareOriginal,
+		OriginalDeclarationType: meta.OriginalDeclarationType,
+		AllowContentCopy:        meta.AllowContentCopy,
 	}, nil
 }
 
@@ -1166,6 +1241,7 @@ func printPublishXHSResult(stdout io.Writer, result app.PublishResult) int {
 		fmt.Fprintln(stdout, "xiaohongshu publish prepared; stopped before submit")
 		fmt.Fprintf(stdout, "account: %s\n", result.Request.Account)
 		fmt.Fprintf(stdout, "mode: %s\n", result.Request.Mode)
+		fmt.Fprintf(stdout, "visibility: %s\n", result.Request.Visibility)
 		fmt.Fprintf(stdout, "media: %s\n", result.Result.MediaKind)
 		if result.Request.ScheduleTime != nil {
 			fmt.Fprintf(stdout, "schedule at: %s\n", result.Request.ScheduleTime.In(xhsShanghaiLocation()).Format("2006-01-02 15:04:05"))
@@ -1173,8 +1249,18 @@ func printPublishXHSResult(stdout io.Writer, result app.PublishResult) int {
 		return 0
 	}
 	if result.Result.OnlySelfPublished {
-		fmt.Fprintln(stdout, "xiaohongshu only-self-visible published")
+		fmt.Fprintln(stdout, "xiaohongshu immediate publish submitted")
 		fmt.Fprintf(stdout, "account: %s\n", result.Request.Account)
+		mode := result.Request.Mode
+		if mode == "" {
+			mode = result.Result.Mode
+		}
+		if mode != "" {
+			fmt.Fprintf(stdout, "mode: %s\n", mode)
+		}
+		if result.Request.Visibility != "" {
+			fmt.Fprintf(stdout, "visibility: %s\n", result.Request.Visibility)
+		}
 		fmt.Fprintf(stdout, "media: %s\n", result.Result.MediaKind)
 		if result.Result.AttachedCount > 0 {
 			fmt.Fprintf(stdout, "attached: %d\n", result.Result.AttachedCount)
@@ -1224,6 +1310,7 @@ func runPublishXHS(args []string, stdout io.Writer, stderr io.Writer) int {
 			fmt.Fprintf(stderr, "error reading xhs publish metadata: %v\n", err)
 			return 1
 		}
+		opts.StopBeforeSubmit = cliOpts.StopBeforeSubmit
 		if strings.TrimSpace(opts.Title) == "" {
 			fmt.Fprintln(stderr, "error validating xhs publish metadata: metadata title is required")
 			return 1
diff --git a/cmd/mark2note/main_publish_test.go b/cmd/mark2note/main_publish_test.go
index c387819..41d7600 100644
--- a/cmd/mark2note/main_publish_test.go
+++ b/cmd/mark2note/main_publish_test.go
@@ -27,7 +27,7 @@ func TestUsageTextMentionsPublishXHSCommand(t *testing.T) {
 
 func TestPublishXHSUsageTextMentionsConfigDefaults(t *testing.T) {
 	text := publishXHSUsageText()
-	for _, want := range []string{"--config <file>", "default from xhs.publish.account", "default from xhs.publish.mode", "default from xhs.publish.schedule_at", "default from xhs.publish.browser_path", "default from xhs.publish.profile_dir"} {
+	for _, want := range []string{"--config <file>", "default from xhs.publish.account", "default from xhs.publish.mode", "default from xhs.publish.schedule_at", "default from xhs.publish.collection", "default from xhs.publish.browser_path", "default from xhs.publish.profile_dir"} {
 		if !strings.Contains(text, want) {
 			t.Fatalf("publishXHSUsageText() missing %q", want)
 		}
@@ -35,16 +35,19 @@ func TestPublishXHSUsageTextMentionsConfigDefaults(t *testing.T) {
 }
 
 func TestParsePublishXHSOptionsTracksConfigBackedFlagPresence(t *testing.T) {
-	opts, err := parsePublishXHSOptions([]string{"--config", "alt.yaml", "--account", "writer", "--headless=false", "--profile-dir", "/tmp/xhs", "--mode", "schedule", "--title", "标题", "--content", "正文", "--images", "cover.png"})
+	opts, err := parsePublishXHSOptions([]string{"--config", "alt.yaml", "--account", "writer", "--headless=false", "--profile-dir", "/tmp/xhs", "--mode", "schedule", "--collection", "AI科技日报", "--title", "标题", "--content", "正文", "--images", "cover.png"})
 	if err != nil {
 		t.Fatalf("parsePublishXHSOptions() error = %v", err)
 	}
 	if opts.ConfigPath != "alt.yaml" || !opts.ConfigPathChanged {
 		t.Fatalf("ConfigPath = %#v", opts)
 	}
-	if !opts.AccountChanged || !opts.HeadlessChanged || !opts.ProfileDirChanged || !opts.ModeChanged {
+	if !opts.AccountChanged || !opts.HeadlessChanged || !opts.ProfileDirChanged || !opts.ModeChanged || !opts.CollectionChanged {
 		t.Fatalf("changed flags = %#v", opts)
 	}
+	if opts.Collection != "AI科技日报" {
+		t.Fatalf("Collection = %q, want AI科技日报", opts.Collection)
+	}
 }
 
 func TestParsePublishXHSOptionsUsesDefaultConfigPath(t *testing.T) {
@@ -57,15 +60,25 @@ func TestParsePublishXHSOptionsUsesDefaultConfigPath(t *testing.T) {
 	}
 }
 
+func TestParsePublishXHSOptionsTracksVisibilityFlagPresence(t *testing.T) {
+	opts, err := parsePublishXHSOptions([]string{"--visibility", "public", "--title", "标题", "--content", "正文", "--images", "cover.png"})
+	if err != nil {
+		t.Fatalf("parsePublishXHSOptions() error = %v", err)
+	}
+	if !opts.VisibilityChanged || opts.Visibility != "public" {
+		t.Fatalf("opts = %#v", opts)
+	}
+}
+
 func TestParsePublishXHSOptionsTracksOriginalityFlagPresence(t *testing.T) {
-	opts, err := parsePublishXHSOptions([]string{"--declare-original=false", "--allow-content-copy=true", "--title", "标题", "--content", "正文", "--images", "cover.png"})
+	opts, err := parsePublishXHSOptions([]string{"--declare-original=false", "--original-declaration-type", "ai_generated", "--allow-content-copy=true", "--title", "标题", "--content", "正文", "--images", "cover.png"})
 	if err != nil {
 		t.Fatalf("parsePublishXHSOptions() error = %v", err)
 	}
-	if !opts.DeclareOriginalChanged || !opts.AllowContentCopyChanged {
+	if !opts.DeclareOriginalChanged || !opts.OriginalDeclarationTypeChanged || !opts.AllowContentCopyChanged {
 		t.Fatalf("changed flags = %#v", opts)
 	}
-	if opts.DeclareOriginal != false || opts.AllowContentCopy != true {
+	if opts.DeclareOriginal != false || opts.OriginalDeclarationType != "ai_generated" || opts.AllowContentCopy != true {
 		t.Fatalf("opts = %#v", opts)
 	}
 }
@@ -109,15 +122,21 @@ func TestRunAutoPublishXHSWritesMetadataBeforePublishing(t *testing.T) {
 		if meta.Title != opts.Title || meta.Account != "walker" || meta.Mode != string(xhs.PublishModeOnlySelf) {
 			t.Fatalf("metadata basics = %#v", meta)
 		}
+		if meta.Collection != "AI科技日报" || opts.Collection != "AI科技日报" {
+			t.Fatalf("metadata collection = %q, opts collection = %q", meta.Collection, opts.Collection)
+		}
 		if meta.Content != opts.Content || !reflect.DeepEqual(meta.Tags, opts.Tags) || !reflect.DeepEqual(meta.Images, opts.ImagePaths) {
 			t.Fatalf("metadata publish content = %#v, opts = %#v", meta, opts)
 		}
 		if meta.ChromePath != "/tmp/publish-chrome" || meta.Headless || meta.ProfileDir != "/tmp/xhs-profile" {
 			t.Fatalf("metadata browser fields = %#v", meta)
 		}
-		if !meta.DeclareOriginal || meta.AllowContentCopy {
+		if !meta.DeclareOriginal || meta.OriginalDeclarationType != "ai_generated" || meta.AllowContentCopy {
 			t.Fatalf("metadata originality fields = %#v", meta)
 		}
+		if opts.OriginalDeclarationType != "ai_generated" {
+			t.Fatalf("opts original declaration type = %q, want ai_generated", opts.OriginalDeclarationType)
+		}
 		if meta.InputPath != "article.md" || meta.ConfigPath != "configs/config.yaml" || meta.GeneratedAt != "2026-04-29T10:11:12Z" {
 			t.Fatalf("metadata source fields = %#v", meta)
 		}
@@ -187,15 +206,17 @@ func stubAutoPublishMetadataInputs(t *testing.T, titleTooLong bool) {
 	topicGenerationEnabled := true
 	loadConfig = func(path string) (*config.Config, error) {
 		return &config.Config{XHS: config.XHSCfg{Publish: config.XHSPublishCfg{
-			Account:          "walker",
-			Headless:         &headless,
-			BrowserPath:      "/tmp/publish-chrome",
-			ProfileDir:       "/tmp/xhs-profile",
-			Mode:             string(xhs.PublishModeOnlySelf),
-			DeclareOriginal:  &declareOriginal,
-			AllowContentCopy: &allowContentCopy,
-			ChromeArgs:       []string{"no-first-run"},
-			TopicGeneration:  config.XHSTopicGenerationCfg{Enabled: &topicGenerationEnabled},
+			Account:                 "walker",
+			Headless:                &headless,
+			BrowserPath:             "/tmp/publish-chrome",
+			ProfileDir:              "/tmp/xhs-profile",
+			Mode:                    string(xhs.PublishModeOnlySelf),
+			Collection:              "AI科技日报",
+			DeclareOriginal:         &declareOriginal,
+			OriginalDeclarationType: "ai_generated",
+			AllowContentCopy:        &allowContentCopy,
+			ChromeArgs:              []string{"no-first-run"},
+			TopicGeneration:         config.XHSTopicGenerationCfg{Enabled: &topicGenerationEnabled},
 		}}}, nil
 	}
 	buildPublishTopics = func(cfg *config.Config, markdown string, title string) ([]string, error) {
@@ -248,15 +269,17 @@ func TestRunAutoPublishXHSPublishesGeneratedPNGs(t *testing.T) {
 	topicGenerationEnabled := true
 	loadConfig = func(path string) (*config.Config, error) {
 		return &config.Config{XHS: config.XHSCfg{Publish: config.XHSPublishCfg{
-			Account:          "walker",
-			Headless:         &headless,
-			BrowserPath:      "/tmp/publish-chrome",
-			ProfileDir:       "/tmp/xhs-profile",
-			Mode:             string(xhs.PublishModeOnlySelf),
-			DeclareOriginal:  &declareOriginal,
-			AllowContentCopy: &allowContentCopy,
-			ChromeArgs:       []string{"no-first-run", "no-default-browser-check"},
-			TopicGeneration:  config.XHSTopicGenerationCfg{Enabled: &topicGenerationEnabled},
+			Account:                 "walker",
+			Headless:                &headless,
+			BrowserPath:             "/tmp/publish-chrome",
+			ProfileDir:              "/tmp/xhs-profile",
+			Mode:                    string(xhs.PublishModeOnlySelf),
+			Collection:              "AI科技日报",
+			DeclareOriginal:         &declareOriginal,
+			OriginalDeclarationType: "ai_generated",
+			AllowContentCopy:        &allowContentCopy,
+			ChromeArgs:              []string{"no-first-run", "no-default-browser-check"},
+			TopicGeneration:         config.XHSTopicGenerationCfg{Enabled: &topicGenerationEnabled},
 		}}}, nil
 	}
 	buildPublishTopics = func(cfg *config.Config, markdown string, title string) ([]string, error) {
@@ -300,10 +323,10 @@ func TestRunAutoPublishXHSPublishesGeneratedPNGs(t *testing.T) {
 	if !reflect.DeepEqual(got.ImagePaths, imagePaths) {
 		t.Fatalf("ImagePaths = %#v, want %#v", got.ImagePaths, imagePaths)
 	}
-	if !got.DeclareOriginal || got.AllowContentCopy {
-		t.Fatalf("originality flags = declare:%v copy:%v", got.DeclareOriginal, got.AllowContentCopy)
+	if !got.DeclareOriginal || got.OriginalDeclarationType != "ai_generated" || got.AllowContentCopy {
+		t.Fatalf("originality flags = declare:%v type:%q copy:%v", got.DeclareOriginal, got.OriginalDeclarationType, got.AllowContentCopy)
 	}
-	for _, want := range []string{"generated 2 preview pages", "xiaohongshu only-self-visible published"} {
+	for _, want := range []string{"generated 2 preview pages", "xiaohongshu immediate publish submitted"} {
 		if !strings.Contains(stdout.String(), want) {
 			t.Fatalf("stdout = %q, missing %q", stdout.String(), want)
 		}
@@ -782,9 +805,10 @@ func TestRunPublishXHSUsesConfigDefaultsForOriginalityFlags(t *testing.T) {
 	allowContentCopy := false
 	loadConfig = func(path string) (*config.Config, error) {
 		return &config.Config{XHS: config.XHSCfg{Publish: config.XHSPublishCfg{
-			Account:          "walker",
-			DeclareOriginal:  &declareOriginal,
-			AllowContentCopy: &allowContentCopy,
+			Account:                 "walker",
+			DeclareOriginal:         &declareOriginal,
+			OriginalDeclarationType: "ai_generated",
+			AllowContentCopy:        &allowContentCopy,
 		}}}, nil
 	}
 
@@ -810,18 +834,21 @@ func TestRunPublishXHSReplaysMetadata(t *testing.T) {
 
 	metaPath := filepath.Join(t.TempDir(), xhsPublishMetaFilename)
 	meta := xhsPublishMeta{
-		Title:            "元数据回放标题",
-		Content:          "",
-		Tags:             []string{"AI代理", "工程反思"},
-		Images:           []string{"cover.jpg", "detail.jpg"},
-		Account:          "creator-meta",
-		Mode:             string(xhs.PublishModeOnlySelf),
-		ChromePath:       "/tmp/meta-chrome",
-		Headless:         false,
-		ProfileDir:       "/tmp/meta-profile",
-		DeclareOriginal:  true,
-		AllowContentCopy: false,
-		ChromeArgs:       []string{"no-first-run"},
+		Title:                   "元数据回放标题",
+		Content:                 "",
+		Tags:                    []string{"AI代理", "工程反思"},
+		Images:                  []string{"cover.jpg", "detail.jpg"},
+		Account:                 "creator-meta",
+		Mode:                    string(xhs.PublishModeOnlySelf),
+		Visibility:              "public",
+		Collection:              "AI科技日报",
+		ChromePath:              "/tmp/meta-chrome",
+		Headless:                false,
+		ProfileDir:              "/tmp/meta-profile",
+		DeclareOriginal:         true,
+		OriginalDeclarationType: "ai_generated",
+		AllowContentCopy:        false,
+		ChromeArgs:              []string{"no-first-run"},
 	}
 	data, err := json.Marshal(meta)
 	if err != nil {
@@ -843,24 +870,64 @@ func TestRunPublishXHSReplaysMetadata(t *testing.T) {
 		t.Fatalf("run() = %d, stderr = %s", code, stderr.String())
 	}
 	want := app.PublishOptions{
-		Account:          "creator-meta",
-		Title:            "元数据回放标题",
-		Content:          "",
-		Tags:             []string{"AI代理", "工程反思"},
-		Mode:             string(xhs.PublishModeOnlySelf),
-		ImagePaths:       []string{"cover.jpg", "detail.jpg"},
-		ChromePath:       "/tmp/meta-chrome",
-		Headless:         false,
-		ProfileDir:       "/tmp/meta-profile",
-		ChromeArgs:       []string{"no-first-run"},
-		DeclareOriginal:  true,
-		AllowContentCopy: false,
+		Account:                 "creator-meta",
+		Title:                   "元数据回放标题",
+		Content:                 "",
+		Tags:                    []string{"AI代理", "工程反思"},
+		Mode:                    string(xhs.PublishModeOnlySelf),
+		Visibility:              "public",
+		Collection:              "AI科技日报",
+		ImagePaths:              []string{"cover.jpg", "detail.jpg"},
+		ChromePath:              "/tmp/meta-chrome",
+		Headless:                false,
+		ProfileDir:              "/tmp/meta-profile",
+		ChromeArgs:              []string{"no-first-run"},
+		DeclareOriginal:         true,
+		OriginalDeclarationType: "ai_generated",
+		AllowContentCopy:        false,
 	}
 	if !reflect.DeepEqual(got, want) {
 		t.Fatalf("publish opts = %#v, want %#v", got, want)
 	}
 }
 
+func TestRunPublishXHSReplaysMetadataWithStopBeforeSubmit(t *testing.T) {
+	originalPublishXHS := publishXHS
+	defer func() { publishXHS = originalPublishXHS }()
+
+	metaPath := filepath.Join(t.TempDir(), xhsPublishMetaFilename)
+	meta := xhsPublishMeta{
+		Title:    "元数据回放标题",
+		Tags:     []string{"AI代理"},
+		Images:   []string{"cover.jpg"},
+		Account:  "creator-meta",
+		Mode:     string(xhs.PublishModeOnlySelf),
+		Headless: false,
+	}
+	data, err := json.Marshal(meta)
+	if err != nil {
+		t.Fatalf("Marshal() error = %v", err)
+	}
+	if err := os.WriteFile(metaPath, data, 0o644); err != nil {
+		t.Fatalf("WriteFile(%q) error = %v", metaPath, err)
+	}
+
+	var got app.PublishOptions
+	publishXHS = func(opts app.PublishOptions) (app.PublishResult, error) {
+		got = opts
+		return app.PublishResult{Request: xhs.PublishRequest{Account: opts.Account}, Result: xhs.PublishResult{Mode: xhs.PublishModeOnlySelf, MediaKind: xhs.MediaKindStandard, StoppedBeforeSubmit: true}}, nil
+	}
+
+	var stdout, stderr bytes.Buffer
+	code := run([]string{"publish-xhs", "--meta", metaPath, "--stop-before-submit"}, &stdout, &stderr)
+	if code != 0 {
+		t.Fatalf("run() = %d, stderr = %s", code, stderr.String())
+	}
+	if !got.StopBeforeSubmit {
+		t.Fatalf("StopBeforeSubmit = false, want true; opts = %#v", got)
+	}
+}
+
 func TestRunPublishXHSRejectsMetadataManualFieldConflict(t *testing.T) {
 	originalPublishXHS := publishXHS
 	defer func() { publishXHS = originalPublishXHS }()
@@ -965,7 +1032,7 @@ func TestRunPublishXHSParsesStandardMediaFlags(t *testing.T) {
 	}
 
 	var stdout, stderr bytes.Buffer
-	code := run([]string{"publish-xhs", "--account", "creator-a", "--title", "标题", "--content", "正文", "--images", "cover.jpg,detail.jpg", "--mode", "only-self", "--tags", "效率,AI", "--headless=false", "--profile-dir", "/tmp/xhs-profile"}, &stdout, &stderr)
+	code := run([]string{"publish-xhs", "--account", "creator-a", "--title", "标题", "--content", "正文", "--images", "cover.jpg,detail.jpg", "--mode", "immediate", "--collection", "AI科技日报", "--tags", "效率,AI", "--headless=false", "--profile-dir", "/tmp/xhs-profile"}, &stdout, &stderr)
 	if code != 0 {
 		t.Fatalf("run() = %d, stderr = %s", code, stderr.String())
 	}
@@ -978,6 +1045,8 @@ func TestRunPublishXHSParsesStandardMediaFlags(t *testing.T) {
 		Content:    "正文",
 		Tags:       []string{"效率", "AI"},
 		Mode:       string(xhs.PublishModeOnlySelf),
+		Visibility: string(xhs.PublishVisibilityOnlySelf),
+		Collection: "AI科技日报",
 		ImagePaths: []string{"cover.jpg", "detail.jpg"},
 		ChromePath: defaultOptions().ChromePath,
 		Headless:   false,
@@ -986,7 +1055,7 @@ func TestRunPublishXHSParsesStandardMediaFlags(t *testing.T) {
 	if !reflect.DeepEqual(got, want) {
 		t.Fatalf("publish opts = %#v, want %#v", got, want)
 	}
-	for _, want := range []string{"xiaohongshu only-self-visible published", "account: creator-a", "media: standard"} {
+	for _, want := range []string{"xiaohongshu immediate publish submitted", "account: creator-a", "media: standard"} {
 		if !strings.Contains(stdout.String(), want) {
 			t.Fatalf("stdout = %q, want substring %q", stdout.String(), want)
 		}
@@ -1043,17 +1112,17 @@ func TestRunPublishXHSPrintsOnlySelfVisiblePublished(t *testing.T) {
 	if code != 0 {
 		t.Fatalf("run() = %d, stderr = %s", code, stderr.String())
 	}
-	for _, want := range []string{"xiaohongshu only-self-visible published", "account: creator-a", "media: standard"} {
+	for _, want := range []string{"xiaohongshu immediate publish submitted", "account: creator-a", "media: standard"} {
 		if !strings.Contains(stdout.String(), want) {
 			t.Fatalf("stdout = %q, want substring %q", stdout.String(), want)
 		}
 	}
 }
 
-func TestPrintPublishXHSResultOnlySelfVisibleSummary(t *testing.T) {
+func TestPrintPublishXHSResultImmediateSummaryIncludesModeAndVisibility(t *testing.T) {
 	result := app.PublishResult{
-		Request: xhs.PublishRequest{Account: "creator-a"},
-		Result:  xhs.PublishResult{Mode: xhs.PublishModeOnlySelf, MediaKind: xhs.MediaKindStandard, OnlySelfPublished: true},
+		Request: xhs.PublishRequest{Account: "creator-a", Mode: xhs.PublishModeImmediate, Visibility: xhs.PublishVisibilityPublic},
+		Result:  xhs.PublishResult{Mode: xhs.PublishModeImmediate, MediaKind: xhs.MediaKindStandard, OnlySelfPublished: true},
 	}
 
 	var stdout bytes.Buffer
@@ -1061,7 +1130,7 @@ func TestPrintPublishXHSResultOnlySelfVisibleSummary(t *testing.T) {
 	if code != 0 {
 		t.Fatalf("printPublishXHSResult() = %d, want 0", code)
 	}
-	for _, want := range []string{"xiaohongshu only-self-visible published", "account: creator-a", "media: standard"} {
+	for _, want := range []string{"xiaohongshu immediate publish submitted", "account: creator-a", "mode: immediate", "visibility: public", "media: standard"} {
 		if !strings.Contains(stdout.String(), want) {
 			t.Fatalf("stdout = %q, want substring %q", stdout.String(), want)
 		}
@@ -1111,7 +1180,7 @@ func TestRunPublishXHSPrintsLiveMediaKind(t *testing.T) {
 	if code != 0 {
 		t.Fatalf("run() = %d, stderr = %s", code, stderr.String())
 	}
-	for _, want := range []string{"xiaohongshu only-self-visible published", "account: creator-live", "media: live", "attached: 2", "items: p01-cover,p02-bullets"} {
+	for _, want := range []string{"xiaohongshu immediate publish submitted", "account: creator-live", "media: live", "attached: 2", "items: p01-cover,p02-bullets"} {
 		if !strings.Contains(stdout.String(), want) {
 			t.Fatalf("stdout = %q, want substring %q", stdout.String(), want)
 		}
@@ -1174,7 +1243,7 @@ func TestRunPublishXHSRejectsInvalidMode(t *testing.T) {
 	if code != 1 {
 		t.Fatalf("run() = %d, want 1", code)
 	}
-	if !strings.Contains(stderr.String(), "mode must be only-self or schedule") {
+	if !strings.Contains(stderr.String(), "mode must be immediate or schedule") {
 		t.Fatalf("stderr = %q", stderr.String())
 	}
 }
@@ -1227,7 +1296,8 @@ func TestRunPublishXHSUsesConfigDefaultsWhenFlagsOmitted(t *testing.T) {
 			Headless:    &headless,
 			BrowserPath: "/tmp/publish-chrome",
 			ProfileDir:  "/tmp/from-config",
-			Mode:        "only-self",
+			Mode:        "immediate",
+			Collection:  "AI科技日报",
 			ChromeArgs:  []string{"no-first-run"},
 		}}}, nil
 	}
@@ -1243,7 +1313,7 @@ func TestRunPublishXHSUsesConfigDefaultsWhenFlagsOmitted(t *testing.T) {
 	if code != 0 {
 		t.Fatalf("run() = %d, stderr = %s", code, stderr.String())
 	}
-	if got.Account != "walker" || got.Headless != false || got.ChromePath != "/tmp/publish-chrome" || got.ProfileDir != "/tmp/from-config" || got.Mode != string(xhs.PublishModeOnlySelf) {
+	if got.Account != "walker" || got.Headless != false || got.ChromePath != "/tmp/publish-chrome" || got.ProfileDir != "/tmp/from-config" || got.Mode != string(xhs.PublishModeOnlySelf) || got.Collection != "AI科技日报" {
 		t.Fatalf("merged opts = %#v", got)
 	}
 	if !reflect.DeepEqual(got.ChromeArgs, []string{"no-first-run"}) {
@@ -1268,6 +1338,7 @@ func TestRunPublishXHSCLIOverridesConfigDefaults(t *testing.T) {
 			ProfileDir:  "/tmp/from-config",
 			Mode:        "schedule",
 			ScheduleAt:  "2026-05-01 20:30:00",
+			Collection:  "配置合集",
 		}}}, nil
 	}
 
@@ -1279,7 +1350,7 @@ func TestRunPublishXHSCLIOverridesConfigDefaults(t *testing.T) {
 	}
 
 	var stdout, stderr bytes.Buffer
-	code := run([]string{"publish-xhs", "--account", "writer", "--headless=true", "--chrome", "/tmp/cli-chrome", "--profile-dir", "/tmp/from-cli", "--mode", "schedule", "--schedule-at", "2026-04-16 10:00:00", "--title", "标题", "--content", "正文", "--images", "cover.jpg"}, &stdout, &stderr)
+	code := run([]string{"publish-xhs", "--account", "writer", "--headless=true", "--chrome", "/tmp/cli-chrome", "--profile-dir", "/tmp/from-cli", "--mode", "schedule", "--schedule-at", "2026-04-16 10:00:00", "--collection", "AI科技日报", "--title", "标题", "--content", "正文", "--images", "cover.jpg"}, &stdout, &stderr)
 	if code != 0 {
 		t.Fatalf("run() = %d, stderr = %s", code, stderr.String())
 	}
@@ -1289,6 +1360,9 @@ func TestRunPublishXHSCLIOverridesConfigDefaults(t *testing.T) {
 	if got.ScheduleAt != "2026-04-16 10:00:00" {
 		t.Fatalf("ScheduleAt = %q, want CLI value", got.ScheduleAt)
 	}
+	if got.Collection != "AI科技日报" {
+		t.Fatalf("Collection = %q, want CLI value", got.Collection)
+	}
 }
 
 func TestRunPublishXHSFallsBackWhenDefaultConfigMissing(t *testing.T) {
@@ -1451,7 +1525,7 @@ func TestBuildAutoPublishXHSOptionsUsesScheduleAtFromCLIOverride(t *testing.T) {
 	if err := os.WriteFile(configPath, []byte(`xhs:
   publish:
     account: walker
-    mode: only-self
+    mode: immediate
     schedule_at: "2026-05-01 20:30:00"
 `), 0o644); err != nil {
 		t.Fatalf("WriteFile(config) error = %v", err)
@@ -1474,6 +1548,73 @@ func TestBuildAutoPublishXHSOptionsUsesScheduleAtFromCLIOverride(t *testing.T) {
 	}
 }
 
+func TestBuildAutoPublishXHSOptionsUsesVisibilityFromCLIOverride(t *testing.T) {
+	dir := t.TempDir()
+	inputPath := filepath.Join(dir, "article.md")
+	imagePath := filepath.Join(dir, "p01-cover.png")
+	configPath := filepath.Join(dir, "config.yaml")
+	if err := os.WriteFile(inputPath, []byte("# 自动发布标题\n\n正文"), 0o644); err != nil {
+		t.Fatalf("WriteFile(input) error = %v", err)
+	}
+	if err := os.WriteFile(imagePath, []byte("png"), 0o644); err != nil {
+		t.Fatalf("WriteFile(image) error = %v", err)
+	}
+	if err := os.WriteFile(configPath, []byte(`xhs:
+  publish:
+    account: walker
+    visibility: only-self
+`), 0o644); err != nil {
+		t.Fatalf("WriteFile(config) error = %v", err)
+	}
+
+	got, err := buildAutoPublishXHSOptions(Options{
+		InputPath:            inputPath,
+		ConfigPath:           configPath,
+		XHSTags:              []string{"AI代理"},
+		XHSVisibility:        string(xhs.PublishVisibilityPublic),
+		XHSVisibilityChanged: true,
+	}, app.Result{ImagePaths: []string{imagePath}})
+	if err != nil {
+		t.Fatalf("buildAutoPublishXHSOptions() error = %v", err)
+	}
+	if got.Visibility != string(xhs.PublishVisibilityPublic) {
+		t.Fatalf("Visibility = %q, want public", got.Visibility)
+	}
+}
+
+func TestBuildAutoPublishXHSOptionsPassesStopBeforeSubmit(t *testing.T) {
+	dir := t.TempDir()
+	inputPath := filepath.Join(dir, "article.md")
+	imagePath := filepath.Join(dir, "p01-cover.png")
+	configPath := filepath.Join(dir, "config.yaml")
+	if err := os.WriteFile(inputPath, []byte("# 自动发布标题\n\n正文"), 0o644); err != nil {
+		t.Fatalf("WriteFile(input) error = %v", err)
+	}
+	if err := os.WriteFile(imagePath, []byte("png"), 0o644); err != nil {
+		t.Fatalf("WriteFile(image) error = %v", err)
+	}
+	if err := os.WriteFile(configPath, []byte(`xhs:
+  publish:
+    account: walker
+`), 0o644); err != nil {
+		t.Fatalf("WriteFile(config) error = %v", err)
+	}
+
+	got, err := buildAutoPublishXHSOptions(Options{
+		InputPath:               inputPath,
+		ConfigPath:              configPath,
+		XHSTags:                 []string{"AI代理"},
+		StopBeforeSubmit:        true,
+		StopBeforeSubmitChanged: true,
+	}, app.Result{ImagePaths: []string{imagePath}})
+	if err != nil {
+		t.Fatalf("buildAutoPublishXHSOptions() error = %v", err)
+	}
+	if !got.StopBeforeSubmit {
+		t.Fatalf("StopBeforeSubmit = false, want true")
+	}
+}
+
 func ptrSchedule(input string) *time.Time {
 	tm, err := time.ParseInLocation("2006-01-02 15:04:05", input, time.FixedZone("UTC+8", 8*60*60))
 	if err != nil {
diff --git a/cmd/mark2note/main_test.go b/cmd/mark2note/main_test.go
index c62160b..e4d0da4 100644
--- a/cmd/mark2note/main_test.go
+++ b/cmd/mark2note/main_test.go
@@ -109,7 +109,7 @@ func TestUsageTextMentionsAutoPublishXHSFlags(t *testing.T) {
 		"--publish-xhs              publish generated PNG files to Xiaohongshu after render",
 		"--prepare-xhs              generate Xiaohongshu publish metadata after render without publishing",
 		"--xhs-tags <csv>           override auto-generated Xiaohongshu topics for --publish-xhs/--prepare-xhs",
-		"--xhs-mode <mode>          override Xiaohongshu mode for --publish-xhs/--prepare-xhs",
+		"--xhs-mode <mode>          override Xiaohongshu publish timing mode for --publish-xhs/--prepare-xhs",
 		"--xhs-schedule-at <time>   override Xiaohongshu schedule time for --publish-xhs/--prepare-xhs",
 		"mark2note --input ./example.md --auto-posters --prepare-xhs",
 		"mark2note publish-xhs --meta ./output/preview/xhs-publish-meta.json",
@@ -299,6 +299,36 @@ func TestParseOptionsParsesXHSScheduleOverridesWithPrepareXHS(t *testing.T) {
 	}
 }
 
+func TestParseOptionsParsesXHSVisibilityWithPrepareXHS(t *testing.T) {
+	opts, err := parseOptions([]string{"--input", "article.md", "--prepare-xhs", "--xhs-visibility", "public"})
+	if err != nil {
+		t.Fatalf("parseOptions() error = %v", err)
+	}
+	if !opts.PrepareXHS || opts.XHSVisibility != "public" || !opts.XHSVisibilityChanged {
+		t.Fatalf("opts = %#v, want prepare-xhs visibility override", opts)
+	}
+}
+
+func TestParseOptionsParsesStopBeforeSubmitWithPublishXHS(t *testing.T) {
+	opts, err := parseOptions([]string{"--input", "article.md", "--publish-xhs", "--stop-before-submit"})
+	if err != nil {
+		t.Fatalf("parseOptions() error = %v", err)
+	}
+	if !opts.PublishXHS || !opts.StopBeforeSubmit || !opts.StopBeforeSubmitChanged {
+		t.Fatalf("opts = %#v, want publish-xhs stop-before-submit override", opts)
+	}
+}
+
+func TestParseOptionsRejectsStopBeforeSubmitWithoutPublishXHS(t *testing.T) {
+	_, err := parseOptions([]string{"--input", "article.md", "--stop-before-submit"})
+	if err == nil {
+		t.Fatalf("parseOptions() error = nil, want non-nil")
+	}
+	if !strings.Contains(err.Error(), "--stop-before-submit requires --publish-xhs") {
+		t.Fatalf("error = %v", err)
+	}
+}
+
 func TestParseOptionsRejectsPrepareXHSWithPublishXHS(t *testing.T) {
 	_, err := parseOptions([]string{"--input", "article.md", "--prepare-xhs", "--publish-xhs"})
 	if err == nil {
diff --git a/configs/config.example.yaml b/configs/config.example.yaml
index 37558ee..bcc2db2 100644
--- a/configs/config.example.yaml
+++ b/configs/config.example.yaml
@@ -59,10 +59,19 @@ xhs:
     headless: false
     browser_path: /Applications/Google Chrome.app/Contents/MacOS/Google Chrome
     profile_dir: ~/.config/mark2note/xhs/profiles/walker
-    mode: only-self
-    # mode: schedule 时使用，格式 YYYY-MM-DD HH:MM:SS，按 Asia/Shanghai 解析
+    # mode 控制发布时机/流程，不控制可见性。
+    # 可选值：immediate = 普通立即发布流程；schedule = 定时发布流程，需同时设置 schedule_at。
+    mode: immediate
+    # visibility 控制小红书页面里的可见性选项，不控制发布时机。
+    # 可选值：public = 公开可见，保留页面默认公开状态；only-self = 仅自己可见，自动切换可见性下拉。
+    visibility: only-self
+    # schedule_at 仅在 mode: schedule 时使用；格式 YYYY-MM-DD HH:MM:SS，按 Asia/Shanghai 解析。
     schedule_at: ""
+    # 可选：加入已有小红书合集；留空则不选择合集。Optional existing Xiaohongshu collection name.
+    collection: ""
     declare_original: true
+    # 可选：原创声明内容类型；留空则不选择。当前支持 ai_generated。
+    original_declaration_type: ""
     allow_content_copy: false
     topic_generation:
       enabled: true
diff --git a/internal/ai/deck_builder.go b/internal/ai/deck_builder.go
index e22c818..a22a500 100644
--- a/internal/ai/deck_builder.go
+++ b/internal/ai/deck_builder.go
@@ -17,16 +17,17 @@ const deckPromptConstraintsTemplate = `你是一个严格的 JSON 生成器。
 1. 只能输出 JSON，不要输出解释、代码块或额外文本
 2. pages 数量必须在 3 到 %d 页之间（3-%d 页）
 3. 第一页必须是 cover
-4. 最后一页必须是 ending
+4. 不要强制最后一页使用 ending；只有原文需要明确总结、收束或行动提醒时才使用 ending
 5. 每页结构必须包含：name、variant、meta、content
 6. 每页 name 必须唯一，建议使用顺序编号命名
 7. 每页 meta 必须包含：badge、counter、theme、cta
 8. meta.theme 保留为兼容字段，可使用 default；实际整套卡片颜色由顶层 theme 决定
-9. variant 只能使用：cover、quote、image-caption、bullets、compare、gallery-steps、ending
+9. variant 只能使用：cover、quote、image-caption、text-caption、bullets、compare、gallery-steps、ending
 10. content 字段按 variant 严格约束：
    - cover 只能使用 title/subtitle，且 cover 的 title 必填
    - quote 只能使用 title/quote/note/tip，且 quote 的 title 和 quote 必填
-   - image-caption 只能使用 title/body/images，且 image-caption 的 title 必填、image-caption 最多 1 张图；如果提供 images，每个 image 都必须包含 src 和 alt
+   - image-caption 只能使用 title/body/images，且 image-caption 的 title 必填、image-caption 的 images 必须正好 1 项，每个 image 都必须包含 src 和 alt
+   - text-caption 只能使用 title/body/tip，且 text-caption 的 title 和 body 必填
    - bullets 只能使用 title/items，且 bullets 的 title 必填、items 至少 1 项
    - compare 只能使用 title/compare，且 compare 的 title 必填、compare 必须使用 compare{leftLabel,rightLabel,rows}、compare.leftLabel/rightLabel 必填、rows 至少 1 项，且每个 rows 项都必须包含 left 和 right
    - gallery-steps 只能使用 title/steps/images，且 gallery-steps 的 title 必填、steps 至少 2 个；如果提供 images，每个 image 都必须包含 src 和 alt
@@ -40,8 +41,8 @@ const deckPromptConstraintsTemplate = `你是一个严格的 JSON 生成器。
 17. 如果原文某些术语已使用行内代码反引号表示，改写后必须保留该行内代码语义，不得去掉
 18. 每页可见内容必须完整放进 1242x1656 竖版卡片，不能依赖浏览器裁切
 19. 长正文和长代码块必须保留原文完整内容，不要用省略号、省略说明或伪代码替代 fenced code block
-20. 需要容纳长内容时优先选择 image-caption 或 ending，由渲染层缩小字号和间距；不要为了排版删减原文代码
-21. fenced code block 过长时不要强行塞进单页；拆成连续的 image-caption 页面，每页保留连续、完整、可执行的原始代码片段，不得用省略号替代被拆分的代码`
+20. 需要容纳长内容时优先选择 text-caption、image-caption 或 ending，由渲染层缩小字号和间距；不要为了排版删减原文代码
+21. fenced code block 过长时不要强行塞进单页；拆成连续的 text-caption 或 image-caption 页面，每页保留连续、完整、可执行的原始代码片段，不得用省略号替代被拆分的代码`
 
 const deckPromptMarkdownFooter = "\n\nMarkdown 如下：\n"
 const promptExtraIntro = "以下是本次生成的额外约束，只能用于控制风格、安全边界和取舍；不得原文复制、不得改写、不得概括到 JSON 的任何可见字段里，包括 title、subtitle、body、quote、note、tip、cta、items、steps、compare、images.alt。可见文案只能来自 Markdown 原文："
diff --git a/internal/ai/deck_builder_test.go b/internal/ai/deck_builder_test.go
index 467f097..35baa11 100644
--- a/internal/ai/deck_builder_test.go
+++ b/internal/ai/deck_builder_test.go
@@ -110,8 +110,11 @@ func TestBuildDeckJSONUsesConfiguredCommand(t *testing.T) {
 	if !strings.Contains(prompt, "第一页必须是 cover") {
 		t.Fatalf("prompt missing cover anchor: %q", prompt)
 	}
-	if !strings.Contains(prompt, "最后一页必须是 ending") {
-		t.Fatalf("prompt missing ending anchor: %q", prompt)
+	if !strings.Contains(prompt, "不要强制最后一页使用 ending") {
+		t.Fatalf("prompt missing optional ending guidance: %q", prompt)
+	}
+	if strings.Contains(prompt, "最后一页必须是 ending") {
+		t.Fatalf("prompt should not force ending as the last page: %q", prompt)
 	}
 	if !strings.Contains(prompt, "name、variant、meta、content") {
 		t.Fatalf("prompt missing page field schema: %q", prompt)
@@ -137,18 +140,30 @@ func TestBuildDeckJSONUsesConfiguredCommand(t *testing.T) {
 	if !strings.Contains(prompt, "quote 的 title 和 quote 必填") {
 		t.Fatalf("prompt missing quote required fields: %q", prompt)
 	}
+	if !strings.Contains(prompt, "variant 只能使用：cover、quote、image-caption、text-caption、bullets、compare、gallery-steps、ending") {
+		t.Fatalf("prompt missing text-caption in variant whitelist: %q", prompt)
+	}
 	if !strings.Contains(prompt, "image-caption 只能使用 title/body/images") {
 		t.Fatalf("prompt missing image-caption body/images marker: %q", prompt)
 	}
 	if !strings.Contains(prompt, "image-caption 的 title 必填") {
 		t.Fatalf("prompt missing image-caption required title rule: %q", prompt)
 	}
-	if !strings.Contains(prompt, "image-caption 最多 1 张图") {
-		t.Fatalf("prompt missing image-caption image limit: %q", prompt)
+	if !strings.Contains(prompt, "image-caption 的 images 必须正好 1 项") {
+		t.Fatalf("prompt missing image-caption exact image count: %q", prompt)
+	}
+	if strings.Contains(prompt, "image-caption 最多 1 张图") {
+		t.Fatalf("prompt should not allow image-caption without an image: %q", prompt)
 	}
 	if !strings.Contains(prompt, "每个 image 都必须包含 src 和 alt") {
 		t.Fatalf("prompt missing image src/alt rule: %q", prompt)
 	}
+	if !strings.Contains(prompt, "text-caption 只能使用 title/body/tip") {
+		t.Fatalf("prompt missing text-caption content whitelist: %q", prompt)
+	}
+	if !strings.Contains(prompt, "text-caption 的 title 和 body 必填") {
+		t.Fatalf("prompt missing text-caption required fields: %q", prompt)
+	}
 	if !strings.Contains(prompt, "bullets 只能使用 title/items") {
 		t.Fatalf("prompt missing bullets content whitelist: %q", prompt)
 	}
@@ -241,7 +256,7 @@ func TestBuildDeckJSONPromptPreservesFullVisibleCodeBlocks(t *testing.T) {
 		"每页可见内容必须完整放进 1242x1656 竖版卡片",
 		"长正文和长代码块必须保留原文完整内容",
 		"不要用省略号、省略说明或伪代码替代 fenced code block",
-		"需要容纳长内容时优先选择 image-caption 或 ending，由渲染层缩小字号和间距",
+		"需要容纳长内容时优先选择 text-caption、image-caption 或 ending，由渲染层缩小字号和间距",
 	} {
 		if !strings.Contains(prompt, want) {
 			t.Fatalf("prompt missing full-content fit rule %q: %q", want, prompt)
@@ -275,7 +290,7 @@ func TestBuildDeckJSONPromptSplitsOversizedFencedCodeBlocks(t *testing.T) {
 	prompt := runner.args[3]
 	for _, want := range []string{
 		"fenced code block 过长时不要强行塞进单页",
-		"拆成连续的 image-caption 页面",
+		"拆成连续的 text-caption 或 image-caption 页面",
 		"每页保留连续、完整、可执行的原始代码片段",
 		"不得用省略号替代被拆分的代码",
 	} {
diff --git a/internal/app/publish_service.go b/internal/app/publish_service.go
index 5e80564..74fd2d1 100644
--- a/internal/app/publish_service.go
+++ b/internal/app/publish_service.go
@@ -12,24 +12,27 @@ import (
 )
 
 type PublishOptions struct {
-	Account          string
-	Title            string
-	TitleFile        string
-	Content          string
-	ContentFile      string
-	Tags             []string
-	Mode             string
-	ScheduleAt       string
-	ImagePaths       []string
-	LiveReportPath   string
-	LivePages        []string
-	ChromePath       string
-	Headless         bool
-	ProfileDir       string
-	ChromeArgs       []string
-	DeclareOriginal  bool
-	AllowContentCopy bool
-	StopBeforeSubmit bool
+	Account                 string
+	Title                   string
+	TitleFile               string
+	Content                 string
+	ContentFile             string
+	Tags                    []string
+	Mode                    string
+	Visibility              string
+	ScheduleAt              string
+	Collection              string
+	ImagePaths              []string
+	LiveReportPath          string
+	LivePages               []string
+	ChromePath              string
+	Headless                bool
+	ProfileDir              string
+	ChromeArgs              []string
+	DeclareOriginal         bool
+	OriginalDeclarationType string
+	AllowContentCopy        bool
+	StopBeforeSubmit        bool
 }
 
 type PublishRuntimeOptions struct {
@@ -94,16 +97,27 @@ func (s PublishService) Publish(opts PublishOptions) (PublishResult, error) {
 }
 
 func buildPublishRequest(opts PublishOptions, title string, content string, mode xhs.PublishMode, scheduleTime *time.Time) (xhs.PublishRequest, error) {
+	visibility, err := xhs.ValidateVisibility(opts.Visibility)
+	if err != nil {
+		return xhs.PublishRequest{}, fmt.Errorf("%w: %v", ErrPublishRequestInvalid, err)
+	}
+	declarationType, err := xhs.ValidateOriginalDeclarationType(opts.OriginalDeclarationType)
+	if err != nil {
+		return xhs.PublishRequest{}, fmt.Errorf("%w: %v", ErrPublishRequestInvalid, err)
+	}
 	request := xhs.PublishRequest{
-		Account:          strings.TrimSpace(opts.Account),
-		Title:            xhs.NormalizePublishTitle(title),
-		Content:          content,
-		Tags:             trimSlice(opts.Tags),
-		Mode:             mode,
-		ScheduleTime:     scheduleTime,
-		DeclareOriginal:  opts.DeclareOriginal,
-		AllowContentCopy: opts.AllowContentCopy,
-		StopBeforeSubmit: opts.StopBeforeSubmit,
+		Account:                 strings.TrimSpace(opts.Account),
+		Title:                   xhs.NormalizePublishTitle(title),
+		Content:                 content,
+		Tags:                    trimSlice(opts.Tags),
+		Mode:                    mode,
+		Visibility:              visibility,
+		ScheduleTime:            scheduleTime,
+		Collection:              strings.TrimSpace(opts.Collection),
+		DeclareOriginal:         opts.DeclareOriginal,
+		OriginalDeclarationType: declarationType,
+		AllowContentCopy:        opts.AllowContentCopy,
+		StopBeforeSubmit:        opts.StopBeforeSubmit,
 	}
 	imagePaths := trimSlice(opts.ImagePaths)
 	livePages := trimSlice(opts.LivePages)
diff --git a/internal/app/publish_service_test.go b/internal/app/publish_service_test.go
index c763d88..79d431c 100644
--- a/internal/app/publish_service_test.go
+++ b/internal/app/publish_service_test.go
@@ -49,6 +49,7 @@ func TestPublishServiceBuildsStandardRequestFromInlineFields(t *testing.T) {
 		Content:    "正文",
 		Tags:       []string{"效率", "AI"},
 		Mode:       string(xhs.PublishModeOnlySelf),
+		Collection: "AI科技日报",
 		ImagePaths: []string{"cover.jpg", "detail.jpg"},
 		ChromePath: "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
 		Headless:   true,
@@ -66,6 +67,8 @@ func TestPublishServiceBuildsStandardRequestFromInlineFields(t *testing.T) {
 		Content:    "正文",
 		Tags:       []string{"效率", "AI"},
 		Mode:       xhs.PublishModeOnlySelf,
+		Visibility: xhs.PublishVisibilityOnlySelf,
+		Collection: "AI科技日报",
 		MediaKind:  xhs.MediaKindStandard,
 		ImagePaths: []string{"cover.jpg", "detail.jpg"},
 	}
@@ -263,6 +266,22 @@ func TestPublishServiceCarriesChromeArgsIntoRuntime(t *testing.T) {
 	}
 }
 
+func TestPublishServiceCarriesVisibilityIntoRequest(t *testing.T) {
+	orchestrator := &fakePublishOrchestrator{}
+	service := PublishService{
+		Now:             func() time.Time { return shanghaiNow(2026, 4, 18, 16, 0, 0) },
+		NewOrchestrator: func(PublishRuntimeOptions) PublishOrchestrator { return orchestrator },
+	}
+
+	_, err := service.Publish(PublishOptions{Account: "creator-a", Title: "标题", Content: "正文", Mode: string(xhs.PublishModeOnlySelf), Visibility: "public", ImagePaths: []string{"cover.jpg"}})
+	if err != nil {
+		t.Fatalf("Publish() error = %v", err)
+	}
+	if orchestrator.request.Visibility != xhs.PublishVisibilityPublic {
+		t.Fatalf("Visibility = %q, want public", orchestrator.request.Visibility)
+	}
+}
+
 func TestPublishServiceCarriesOriginalityFlagsIntoRequest(t *testing.T) {
 	orchestrator := &fakePublishOrchestrator{}
 	service := PublishService{
@@ -271,18 +290,19 @@ func TestPublishServiceCarriesOriginalityFlagsIntoRequest(t *testing.T) {
 	}
 
 	_, err := service.Publish(PublishOptions{
-		Account:          "creator-a",
-		Title:            "标题",
-		Content:          "正文",
-		Mode:             string(xhs.PublishModeOnlySelf),
-		ImagePaths:       []string{"cover.jpg"},
-		DeclareOriginal:  true,
-		AllowContentCopy: false,
+		Account:                 "creator-a",
+		Title:                   "标题",
+		Content:                 "正文",
+		Mode:                    string(xhs.PublishModeOnlySelf),
+		ImagePaths:              []string{"cover.jpg"},
+		DeclareOriginal:         true,
+		OriginalDeclarationType: "ai_generated",
+		AllowContentCopy:        false,
 	})
 	if err != nil {
 		t.Fatalf("Publish() error = %v", err)
 	}
-	if !orchestrator.request.DeclareOriginal || orchestrator.request.AllowContentCopy {
+	if !orchestrator.request.DeclareOriginal || orchestrator.request.OriginalDeclarationType != "ai_generated" || orchestrator.request.AllowContentCopy {
 		t.Fatalf("request = %#v", orchestrator.request)
 	}
 }
diff --git a/internal/app/service.go b/internal/app/service.go
index e19b1a5..3f545de 100644
--- a/internal/app/service.go
+++ b/internal/app/service.go
@@ -2,9 +2,11 @@ package app
 
 import (
 	"context"
+	"encoding/base64"
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
@@ -52,10 +54,14 @@ type Options struct {
 	PosterSources            []string
 	PublishXHS               bool
 	PrepareXHS               bool
+	StopBeforeSubmit         bool
+	StopBeforeSubmitChanged  bool
 	XHSTags                  []string
 	XHSTagsChanged           bool
 	XHSMode                  string
 	XHSModeChanged           bool
+	XHSVisibility            string
+	XHSVisibilityChanged     bool
 	XHSScheduleAt            string
 	XHSScheduleAtChanged     bool
 	Animated                 AnimatedOptions
@@ -154,6 +160,7 @@ func (s Service) GeneratePreview(opts Options) (Result, error) {
 	if d, posterWarnings, err = s.hydratePosters(opts, d, string(markdownBytes)); err != nil {
 		return Result{}, err
 	}
+	d = hydrateLocalImageAssets(d, filepath.Dir(opts.InputPath))
 
 	result, err := s.renderDeck(opts, cfg, d, sourceRenderMeta{})
 	result.Warnings = append(posterWarnings, result.Warnings...)
@@ -185,6 +192,7 @@ func (s Service) GenerateFromDeck(opts Options) (Result, error) {
 	if d, posterWarnings, err = s.hydratePosters(opts, d, ""); err != nil {
 		return Result{}, err
 	}
+	d = hydrateLocalImageAssets(d, filepath.Dir(opts.FromDeckPath))
 	meta, err := s.readRenderMetaForDeck(opts.FromDeckPath)
 	if err != nil {
 		return Result{}, err
@@ -276,6 +284,63 @@ func appendMissingPosterWarning(warnings []string, title string) []string {
 	return append(warnings, warning)
 }
 
+func hydrateLocalImageAssets(d deck.Deck, baseDir string) deck.Deck {
+	baseDir = strings.TrimSpace(baseDir)
+	if baseDir == "" {
+		return d
+	}
+	if abs, err := filepath.Abs(baseDir); err == nil {
+		baseDir = abs
+	}
+	for pageIndex := range d.Pages {
+		for imageIndex := range d.Pages[pageIndex].Content.Images {
+			src := strings.TrimSpace(d.Pages[pageIndex].Content.Images[imageIndex].Src)
+			if !isLocalRelativeImageAsset(src) {
+				continue
+			}
+			path := filepath.Join(baseDir, filepath.Clean(filepath.FromSlash(src)))
+			if !pathWithinBaseDir(baseDir, path) {
+				continue
+			}
+			dataURI := localImageDataURI(path)
+			if dataURI == "" {
+				continue
+			}
+			d.Pages[pageIndex].Content.Images[imageIndex].Src = dataURI
+		}
+	}
+	return d
+}
+
+func isLocalRelativeImageAsset(src string) bool {
+	src = strings.TrimSpace(src)
+	if src == "" || filepath.IsAbs(src) || strings.Contains(src, "://") || strings.HasPrefix(src, "data:image/") {
+		return false
+	}
+	cleaned := filepath.Clean(filepath.FromSlash(src))
+	return cleaned != "." && cleaned != ".." && !strings.HasPrefix(cleaned, ".."+string(filepath.Separator))
+}
+
+func pathWithinBaseDir(baseDir string, path string) bool {
+	rel, err := filepath.Rel(baseDir, path)
+	if err != nil {
+		return false
+	}
+	return rel == "." || rel != ".." && !strings.HasPrefix(rel, ".."+string(filepath.Separator))
+}
+
+func localImageDataURI(path string) string {
+	data, err := os.ReadFile(path)
+	if err != nil || len(data) == 0 {
+		return ""
+	}
+	contentType := http.DetectContentType(data)
+	if !strings.HasPrefix(contentType, "image/") {
+		return ""
+	}
+	return "data:" + contentType + ";base64," + base64.StdEncoding.EncodeToString(data)
+}
+
 func (s Service) renderDeck(opts Options, cfg *config.Config, d deck.Deck, source sourceRenderMeta) (Result, error) {
 	meta := source.Meta
 	if !opts.AnimatedEnabledChanged {
diff --git a/internal/app/service_test.go b/internal/app/service_test.go
index b7272bf..5e408f6 100644
--- a/internal/app/service_test.go
+++ b/internal/app/service_test.go
@@ -213,6 +213,40 @@ func TestServiceGeneratePreviewSuccess(t *testing.T) {
 	}
 }
 
+func TestServiceGeneratePreviewInlinesLocalImageAssetsBeforeRendering(t *testing.T) {
+	root := t.TempDir()
+	articleDir := filepath.Join(root, "article")
+	imagePath := filepath.Join(articleDir, "media", "inline-local-001.png")
+	if err := os.MkdirAll(filepath.Dir(imagePath), 0o755); err != nil {
+		t.Fatalf("MkdirAll() error = %v", err)
+	}
+	if err := os.WriteFile(imagePath, []byte("\x89PNG\r\n\x1a\nimage"), 0o644); err != nil {
+		t.Fatalf("WriteFile(image) error = %v", err)
+	}
+	articlePath := filepath.Join(articleDir, "article.md")
+	if err := os.WriteFile(articlePath, []byte("# 标题\n\n![图](media/inline-local-001.png)\n"), 0o644); err != nil {
+		t.Fatalf("WriteFile(article) error = %v", err)
+	}
+	cfg := &config.Config{Output: config.OutputCfg{Dir: root}}
+	deckJSON := `{"pages":[{"name":"p1-cover","variant":"cover","meta":{"badge":"第 1 页","counter":"1/3","theme":"default","cta":"cta1"},"content":{"title":"封面"}},{"name":"p2-image-caption","variant":"image-caption","meta":{"badge":"第 2 页","counter":"2/3","theme":"default","cta":"cta2"},"content":{"title":"图文","images":[{"src":"media/inline-local-001.png","alt":"图"}] }},{"name":"p3-ending","variant":"ending","meta":{"badge":"第 3 页","counter":"3/3","theme":"default","cta":"cta3"},"content":{"title":"结尾","body":"正文"}}]}`
+	r := &fakeRenderer{}
+	svc := Service{
+		LoadConfig:    func(string) (*config.Config, error) { return cfg, nil },
+		ReadFile:      os.ReadFile,
+		BuildDeckJSON: func(*config.Config, string) (string, error) { return deckJSON, nil },
+		NewRenderer:   func(Options) DeckRenderer { return r },
+	}
+
+	_, err := svc.GeneratePreview(Options{InputPath: articlePath, ConfigPath: "config.yaml", Jobs: 2})
+	if err != nil {
+		t.Fatalf("GeneratePreview() error = %v", err)
+	}
+	got := r.rendered.Pages[1].Content.Images[0].Src
+	if !strings.HasPrefix(got, "data:image/png;base64,") {
+		t.Fatalf("rendered image src = %q, want local image data URI", got)
+	}
+}
+
 func TestServiceGeneratePreviewHydratesAssetManifestBeforeRendering(t *testing.T) {
 	root := t.TempDir()
 	manifestPath := filepath.Join(root, "posters.yaml")
diff --git a/internal/config/config.go b/internal/config/config.go
index a9b33b6..75463f6 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -112,17 +112,20 @@ type XHSCfg struct {
 }
 
 type XHSPublishCfg struct {
-	Account          string                `yaml:"account"`
-	Headless         *bool                 `yaml:"headless"`
-	BrowserPath      string                `yaml:"browser_path"`
-	ProfileDir       string                `yaml:"profile_dir"`
-	Mode             string                `yaml:"mode"`
-	ScheduleAt       string                `yaml:"schedule_at"`
-	DeclareOriginal  *bool                 `yaml:"declare_original"`
-	AllowContentCopy *bool                 `yaml:"allow_content_copy"`
-	ChromeArgs       []string              `yaml:"chrome_args"`
-	TopicGeneration  XHSTopicGenerationCfg `yaml:"topic_generation"`
-	TitleGeneration  XHSTitleGenerationCfg `yaml:"title_generation"`
+	Account                 string                `yaml:"account"`
+	Headless                *bool                 `yaml:"headless"`
+	BrowserPath             string                `yaml:"browser_path"`
+	ProfileDir              string                `yaml:"profile_dir"`
+	Mode                    string                `yaml:"mode"`
+	Visibility              string                `yaml:"visibility"`
+	ScheduleAt              string                `yaml:"schedule_at"`
+	Collection              string                `yaml:"collection"`
+	DeclareOriginal         *bool                 `yaml:"declare_original"`
+	OriginalDeclarationType string                `yaml:"original_declaration_type"`
+	AllowContentCopy        *bool                 `yaml:"allow_content_copy"`
+	ChromeArgs              []string              `yaml:"chrome_args"`
+	TopicGeneration         XHSTopicGenerationCfg `yaml:"topic_generation"`
+	TitleGeneration         XHSTitleGenerationCfg `yaml:"title_generation"`
 }
 
 type XHSTopicGenerationCfg struct {
@@ -145,7 +148,25 @@ var DefaultXHSPublishChromeArgs = []string{
 
 func validateXHSPublishMode(value string) error {
 	switch strings.TrimSpace(value) {
-	case "", "only-self", "schedule":
+	case "", "immediate", "schedule":
+		return nil
+	default:
+		return fmt.Errorf("unsupported value %q", value)
+	}
+}
+
+func validateXHSPublishVisibility(value string) error {
+	switch strings.TrimSpace(value) {
+	case "", "only-self", "public":
+		return nil
+	default:
+		return fmt.Errorf("unsupported value %q", value)
+	}
+}
+
+func validateXHSPublishOriginalDeclarationType(value string) error {
+	switch strings.TrimSpace(value) {
+	case "", "ai_generated":
 		return nil
 	default:
 		return fmt.Errorf("unsupported value %q", value)
@@ -321,16 +342,28 @@ func Load(configPath string) (*Config, error) {
 	if cfg.Render.Live.ImportTimeout == 0 {
 		cfg.Render.Live.ImportTimeout = 120 * time.Second
 	}
+	cfg.XHS.Publish.Mode = strings.TrimSpace(cfg.XHS.Publish.Mode)
 	if cfg.XHS.Publish.Mode == "" {
-		cfg.XHS.Publish.Mode = "only-self"
+		cfg.XHS.Publish.Mode = "immediate"
 	}
 	if err := validateXHSPublishMode(cfg.XHS.Publish.Mode); err != nil {
 		return nil, fmt.Errorf("validate xhs.publish.mode: %w", err)
 	}
+	cfg.XHS.Publish.Visibility = strings.TrimSpace(cfg.XHS.Publish.Visibility)
+	if cfg.XHS.Publish.Visibility == "" {
+		cfg.XHS.Publish.Visibility = "only-self"
+	}
+	if err := validateXHSPublishVisibility(cfg.XHS.Publish.Visibility); err != nil {
+		return nil, fmt.Errorf("validate xhs.publish.visibility: %w", err)
+	}
 	if cfg.XHS.Publish.DeclareOriginal == nil {
 		enabled := true
 		cfg.XHS.Publish.DeclareOriginal = &enabled
 	}
+	cfg.XHS.Publish.OriginalDeclarationType = strings.TrimSpace(cfg.XHS.Publish.OriginalDeclarationType)
+	if err := validateXHSPublishOriginalDeclarationType(cfg.XHS.Publish.OriginalDeclarationType); err != nil {
+		return nil, fmt.Errorf("validate xhs.publish.original_declaration_type: %w", err)
+	}
 	if cfg.XHS.Publish.AllowContentCopy == nil {
 		enabled := false
 		cfg.XHS.Publish.AllowContentCopy = &enabled
diff --git a/internal/config/config_test.go b/internal/config/config_test.go
index ef266e7..6d2d155 100644
--- a/internal/config/config_test.go
+++ b/internal/config/config_test.go
@@ -588,8 +588,8 @@ func TestLoadAppliesDefaultXHSPublishConfig(t *testing.T) {
 	if cfg.XHS.Publish.ProfileDir != "" {
 		t.Fatalf("ProfileDir = %q, want empty", cfg.XHS.Publish.ProfileDir)
 	}
-	if cfg.XHS.Publish.Mode != "only-self" {
-		t.Fatalf("Mode = %q, want only-self", cfg.XHS.Publish.Mode)
+	if cfg.XHS.Publish.Mode != "immediate" {
+		t.Fatalf("Mode = %q, want immediate", cfg.XHS.Publish.Mode)
 	}
 	if !reflect.DeepEqual(cfg.XHS.Publish.ChromeArgs, DefaultXHSPublishChromeArgs) {
 		t.Fatalf("ChromeArgs = %#v, want %#v", cfg.XHS.Publish.ChromeArgs, DefaultXHSPublishChromeArgs)
@@ -605,7 +605,7 @@ func TestLoadAppliesDefaultXHSPublishConfig(t *testing.T) {
 func TestLoadKeepsExplicitXHSPublishConfig(t *testing.T) {
 	dir := t.TempDir()
 	path := filepath.Join(dir, "config.yaml")
-	content := "xhs:\n  publish:\n    account: walker\n    headless: false\n    browser_path: /Applications/Google Chrome.app/Contents/MacOS/Google Chrome\n    profile_dir: ~/.config/mark2note/xhs/profiles/walker\n    mode: schedule\n    chrome_args:\n      - --no-first-run\n      - proxy-server=http://127.0.0.1:8080\n"
+	content := "xhs:\n  publish:\n    account: walker\n    headless: false\n    browser_path: /Applications/Google Chrome.app/Contents/MacOS/Google Chrome\n    profile_dir: ~/.config/mark2note/xhs/profiles/walker\n    mode: schedule\n    collection: AI科技日报\n    chrome_args:\n      - --no-first-run\n      - proxy-server=http://127.0.0.1:8080\n"
 	if err := os.WriteFile(path, []byte(content), 0o644); err != nil {
 		t.Fatalf("WriteFile() error = %v", err)
 	}
@@ -629,6 +629,9 @@ func TestLoadKeepsExplicitXHSPublishConfig(t *testing.T) {
 	if cfg.XHS.Publish.Mode != "schedule" {
 		t.Fatalf("Mode = %q, want schedule", cfg.XHS.Publish.Mode)
 	}
+	if cfg.XHS.Publish.Collection != "AI科技日报" {
+		t.Fatalf("Collection = %q, want AI科技日报", cfg.XHS.Publish.Collection)
+	}
 	wantChromeArgs := []string{"--no-first-run", "proxy-server=http://127.0.0.1:8080"}
 	if !reflect.DeepEqual(cfg.XHS.Publish.ChromeArgs, wantChromeArgs) {
 		t.Fatalf("ChromeArgs = %#v, want %#v", cfg.XHS.Publish.ChromeArgs, wantChromeArgs)
@@ -712,6 +715,51 @@ func TestLoadKeepsExplicitEmptyXHSPublishChromeArgs(t *testing.T) {
 	}
 }
 
+func TestLoadDefaultsXHSPublishVisibilityToOnlySelf(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "config.yaml")
+	if err := os.WriteFile(path, []byte("output:\n  dir: out\n"), 0o644); err != nil {
+		t.Fatalf("WriteFile() error = %v", err)
+	}
+
+	cfg, err := Load(path)
+	if err != nil {
+		t.Fatalf("Load() error = %v", err)
+	}
+	if cfg.XHS.Publish.Visibility != "only-self" {
+		t.Fatalf("Visibility = %q, want only-self", cfg.XHS.Publish.Visibility)
+	}
+}
+
+func TestLoadKeepsExplicitXHSPublishVisibility(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "config.yaml")
+	if err := os.WriteFile(path, []byte("xhs:\n  publish:\n    visibility: public\n"), 0o644); err != nil {
+		t.Fatalf("WriteFile() error = %v", err)
+	}
+
+	cfg, err := Load(path)
+	if err != nil {
+		t.Fatalf("Load() error = %v", err)
+	}
+	if cfg.XHS.Publish.Visibility != "public" {
+		t.Fatalf("Visibility = %q, want public", cfg.XHS.Publish.Visibility)
+	}
+}
+
+func TestLoadRejectsInvalidXHSPublishVisibility(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "config.yaml")
+	if err := os.WriteFile(path, []byte("xhs:\n  publish:\n    visibility: friends\n"), 0o644); err != nil {
+		t.Fatalf("WriteFile() error = %v", err)
+	}
+
+	_, err := Load(path)
+	if err == nil || !strings.Contains(err.Error(), "validate xhs.publish.visibility") {
+		t.Fatalf("Load() error = %v, want visibility validation error", err)
+	}
+}
+
 func TestLoadRejectsInvalidXHSPublishMode(t *testing.T) {
 	dir := t.TempDir()
 	path := filepath.Join(dir, "config.yaml")
@@ -763,3 +811,34 @@ func TestLoadKeepsExplicitXHSPublishOriginalityConfig(t *testing.T) {
 		t.Fatalf("AllowContentCopy = %#v, want true", cfg.XHS.Publish.AllowContentCopy)
 	}
 }
+
+func TestLoadKeepsExplicitXHSPublishOriginalDeclarationType(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "config.yaml")
+	content := "xhs:\n  publish:\n    original_declaration_type: ai_generated\n"
+	if err := os.WriteFile(path, []byte(content), 0o644); err != nil {
+		t.Fatalf("WriteFile() error = %v", err)
+	}
+
+	cfg, err := Load(path)
+	if err != nil {
+		t.Fatalf("Load() error = %v", err)
+	}
+	if cfg.XHS.Publish.OriginalDeclarationType != "ai_generated" {
+		t.Fatalf("OriginalDeclarationType = %q, want ai_generated", cfg.XHS.Publish.OriginalDeclarationType)
+	}
+}
+
+func TestLoadRejectsInvalidXHSPublishOriginalDeclarationType(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "config.yaml")
+	content := "xhs:\n  publish:\n    original_declaration_type: sponsored\n"
+	if err := os.WriteFile(path, []byte(content), 0o644); err != nil {
+		t.Fatalf("WriteFile() error = %v", err)
+	}
+
+	_, err := Load(path)
+	if err == nil || !strings.Contains(err.Error(), "validate xhs.publish.original_declaration_type") {
+		t.Fatalf("Load() error = %v, want original declaration type validation error", err)
+	}
+}
diff --git a/internal/deck/deck.go b/internal/deck/deck.go
index 4fd99b4..8d88eed 100644
--- a/internal/deck/deck.go
+++ b/internal/deck/deck.go
@@ -154,6 +154,7 @@ var supportedVariants = map[string]struct{}{
 	"cover":         {},
 	"quote":         {},
 	"image-caption": {},
+	"text-caption":  {},
 	"bullets":       {},
 	"compare":       {},
 	"gallery-steps": {},
@@ -176,6 +177,11 @@ var allowedContentFieldsByVariant = map[string]map[string]struct{}{
 		"body":   {},
 		"images": {},
 	},
+	"text-caption": {
+		"title": {},
+		"body":  {},
+		"tip":   {},
+	},
 	"bullets": {
 		"title": {},
 		"items": {},
@@ -257,6 +263,9 @@ func DefaultDeck(outDir string) Deck {
 			Content: PageContent{
 				Title: "先给结论，再补背景",
 				Body:  "图文页适合承接复杂信息：用一段说明解释原因，再用配图帮助读者快速建立场景。",
+				Images: []ImageBlock{
+					{Src: "https://example.com/context.png", Alt: "内容结构示意图"},
+				},
 			},
 		},
 		{
@@ -300,35 +309,35 @@ func DefaultDeck(outDir string) Deck {
 			},
 		},
 		{
-			Name:    "p6-image-caption",
-			Variant: "image-caption",
+			Name:    "p6-gallery-steps",
+			Variant: "gallery-steps",
 			Meta: PageMeta{
 				Badge:   "第 6 页",
 				Counter: "6/8",
 				Theme:   ThemeDefault,
-				CTA:     "示意图可以降低理解门槛",
+				CTA:     "把方法沉淀为可复用流程",
 			},
 			Content: PageContent{
-				Title: "给复杂步骤配一张示意图",
-				Body:  "当流程较长时，用图示标注关键节点，能帮助读者快速把握输入、处理和输出关系。",
+				Title: "拆解步骤示例",
+				Steps: []string{
+					"收集素材并标注主题",
+					"提炼结论并确定页面顺序",
+					"校对语句后统一视觉风格",
+				},
 			},
 		},
 		{
-			Name:    "p7-gallery-steps",
-			Variant: "gallery-steps",
+			Name:    "p7-text-caption",
+			Variant: "text-caption",
 			Meta: PageMeta{
 				Badge:   "第 7 页",
 				Counter: "7/8",
 				Theme:   ThemeDefault,
-				CTA:     "把方法沉淀为可复用流程",
+				CTA:     "无图也保留信息层次",
 			},
 			Content: PageContent{
-				Title: "拆解步骤示例",
-				Steps: []string{
-					"收集素材并标注主题",
-					"提炼结论并确定页面顺序",
-					"校对语句后统一视觉风格",
-				},
+				Title: "没有配图时拆成两块信息",
+				Body:  "**摘要：** 用短段落保留新闻事实和关键背景，让读者先建立完整理解。\n\n**影响：** 再单独说明后续变化、判断标准或行动建议，避免把结论压成一句口号。",
 			},
 		},
 		{
@@ -410,9 +419,6 @@ func (d Deck) ValidateWithMaxPages(configuredMaxPages int) error {
 	if d.Pages[0].Variant != "cover" {
 		return fmt.Errorf("first page must use cover variant")
 	}
-	if d.Pages[len(d.Pages)-1].Variant != "ending" {
-		return fmt.Errorf("last page must use ending variant")
-	}
 	seenNames := make(map[string]struct{}, len(d.Pages))
 	for _, page := range d.Pages {
 		if page.Name == "" {
@@ -515,6 +521,9 @@ func validateContent(page Page) error {
 		if content.Title == "" {
 			return pageErr(page.Name, page.Variant, "title is required")
 		}
+		if len(content.Images) == 0 {
+			return pageErr(page.Name, page.Variant, "images requires exactly 1 item")
+		}
 		if len(content.Images) > 1 {
 			return pageErr(page.Name, page.Variant, "images accepts at most 1 item")
 		}
@@ -523,6 +532,13 @@ func validateContent(page Page) error {
 				return pageErr(page.Name, page.Variant, "images[%d].src and images[%d].alt are required", i, i)
 			}
 		}
+	case "text-caption":
+		if content.Title == "" {
+			return pageErr(page.Name, page.Variant, "title is required")
+		}
+		if content.Body == "" {
+			return pageErr(page.Name, page.Variant, "body is required")
+		}
 	case "bullets":
 		if content.Title == "" {
 			return pageErr(page.Name, page.Variant, "title is required")
diff --git a/internal/deck/deck_test.go b/internal/deck/deck_test.go
index ac93990..14961c6 100644
--- a/internal/deck/deck_test.go
+++ b/internal/deck/deck_test.go
@@ -47,7 +47,7 @@ func TestDefaultDeckStillCoversAllSupportedVariants(t *testing.T) {
 		seen[page.Variant] = true
 	}
 
-	for _, variant := range []string{"cover", "quote", "image-caption", "bullets", "compare", "gallery-steps", "ending"} {
+	for _, variant := range []string{"cover", "quote", "image-caption", "text-caption", "bullets", "compare", "gallery-steps", "ending"} {
 		if !seen[variant] {
 			t.Fatalf("missing variant %q in default deck", variant)
 		}
@@ -144,12 +144,12 @@ func TestDeckFromJSONAcceptsTwelvePagesWithContentSchema(t *testing.T) {
     {"name":"p01-cover","variant":"cover","meta":{"badge":"第 1 页","counter":"1/12","theme":"orange","cta":"cta"},"content":{"title":"封面","subtitle":"副标题"}},
     {"name":"p02-bullets","variant":"bullets","meta":{"badge":"第 2 页","counter":"2/12","theme":"orange","cta":"cta"},"content":{"title":"列表页","items":["a","b"]}},
     {"name":"p03-quote","variant":"quote","meta":{"badge":"第 3 页","counter":"3/12","theme":"orange","cta":"cta"},"content":{"title":"引用页","quote":"一句话"}},
-    {"name":"p04-image","variant":"image-caption","meta":{"badge":"第 4 页","counter":"4/12","theme":"orange","cta":"cta"},"content":{"title":"图文页"}},
+    {"name":"p04-text","variant":"text-caption","meta":{"badge":"第 4 页","counter":"4/12","theme":"orange","cta":"cta"},"content":{"title":"文字页","body":"**摘要：** 事实。\n\n**影响：** 判断。"}},
     {"name":"p05-compare","variant":"compare","meta":{"badge":"第 5 页","counter":"5/12","theme":"green","cta":"cta"},"content":{"title":"对比页","compare":{"leftLabel":"旧","rightLabel":"新","rows":[{"left":"慢","right":"快"}]}}},
     {"name":"p06-gallery","variant":"gallery-steps","meta":{"badge":"第 6 页","counter":"6/12","theme":"green","cta":"cta"},"content":{"title":"步骤页","steps":["第一步","第二步"]}},
     {"name":"p07-bullets","variant":"bullets","meta":{"badge":"第 7 页","counter":"7/12","theme":"orange","cta":"cta"},"content":{"title":"列表页 2","items":["x"]}},
     {"name":"p08-quote","variant":"quote","meta":{"badge":"第 8 页","counter":"8/12","theme":"orange","cta":"cta"},"content":{"title":"引用页 2","quote":"第二句"}},
-    {"name":"p09-image","variant":"image-caption","meta":{"badge":"第 9 页","counter":"9/12","theme":"green","cta":"cta"},"content":{"title":"图文页 2"}},
+    {"name":"p09-image","variant":"image-caption","meta":{"badge":"第 9 页","counter":"9/12","theme":"green","cta":"cta"},"content":{"title":"图文页 2","images":[{"src":"image.png","alt":"图"}]}},
     {"name":"p10-compare","variant":"compare","meta":{"badge":"第 10 页","counter":"10/12","theme":"green","cta":"cta"},"content":{"title":"对比页 2","compare":{"leftLabel":"A","rightLabel":"B","rows":[{"left":"一","right":"二"}]}}},
     {"name":"p11-gallery","variant":"gallery-steps","meta":{"badge":"第 11 页","counter":"11/12","theme":"green","cta":"cta"},"content":{"title":"步骤页 2","steps":["一","二","三"]}},
     {"name":"p12-ending","variant":"ending","meta":{"badge":"第 12 页","counter":"12/12","theme":"green","cta":"cta"},"content":{"title":"结尾","body":"总结"}}
@@ -212,21 +212,21 @@ func TestDeckFromJSONRejectsWhenFirstPageIsNotCover(t *testing.T) {
 	}
 }
 
-func TestDeckFromJSONRejectsWhenLastPageIsNotEnding(t *testing.T) {
+func TestDeckFromJSONAcceptsNewsDeckWithoutEndingPage(t *testing.T) {
 	raw := `{
   "pages": [
     {"name":"p01-cover","variant":"cover","meta":{"badge":"第 1 页","counter":"1/3","theme":"orange","cta":"cta"},"content":{"title":"封面"}},
     {"name":"p02-bullets","variant":"bullets","meta":{"badge":"第 2 页","counter":"2/3","theme":"orange","cta":"cta"},"content":{"title":"列表","items":["a"]}},
-    {"name":"p03-quote","variant":"quote","meta":{"badge":"第 3 页","counter":"3/3","theme":"green","cta":"cta"},"content":{"title":"结尾?","quote":"不是 ending"}}
+    {"name":"p03-text","variant":"text-caption","meta":{"badge":"第 3 页","counter":"3/3","theme":"green","cta":"cta"},"content":{"title":"最后一条新闻","body":"**摘要：** 事实。\n\n**影响：** 判断。"}}
   ]
 }`
 
-	_, err := FromJSON(raw, "/tmp/out")
-	if err == nil {
-		t.Fatalf("FromJSON() error = nil, want non-nil")
+	d, err := FromJSON(raw, "/tmp/out")
+	if err != nil {
+		t.Fatalf("FromJSON() error = %v", err)
 	}
-	if !strings.Contains(err.Error(), "last page must use ending variant") {
-		t.Fatalf("error = %v", err)
+	if got := d.Pages[len(d.Pages)-1].Variant; got != "text-caption" {
+		t.Fatalf("last variant = %q, want text-caption", got)
 	}
 }
 
@@ -353,6 +353,24 @@ func TestDeckFromJSONRejectsUnsupportedVariant(t *testing.T) {
 	}
 }
 
+func TestDeckFromJSONRejectsImageCaptionWithoutImages(t *testing.T) {
+	raw := `{
+  "pages": [
+    {"name":"p01-cover","variant":"cover","meta":{"badge":"第 1 页","counter":"1/3","theme":"orange","cta":"cta"},"content":{"title":"封面"}},
+    {"name":"p02-image","variant":"image-caption","meta":{"badge":"第 2 页","counter":"2/3","theme":"orange","cta":"cta"},"content":{"title":"图文"}},
+    {"name":"p03-ending","variant":"ending","meta":{"badge":"第 3 页","counter":"3/3","theme":"green","cta":"cta"},"content":{"title":"结尾","body":"总结"}}
+  ]
+}`
+
+	_, err := FromJSON(raw, "/tmp/out")
+	if err == nil {
+		t.Fatal("FromJSON() error = nil, want non-nil")
+	}
+	if !strings.Contains(err.Error(), `page "p02-image" (image-caption): images requires exactly 1 item`) {
+		t.Fatalf("error = %v", err)
+	}
+}
+
 func TestDeckFromJSONRejectsImageCaptionWithMoreThanOneImage(t *testing.T) {
 	raw := `{
   "pages": [
diff --git a/internal/render/animated.go b/internal/render/animated.go
index 8ea9161..741235d 100644
--- a/internal/render/animated.go
+++ b/internal/render/animated.go
@@ -209,6 +209,13 @@ func defaultAnimatedPreset(variant string) (animatedPreset, bool) {
 			Image: "scale-in",
 			CTA:   "fade-in",
 		}, true
+	case "text-caption":
+		return animatedPreset{
+			Title: "fade-in",
+			Body:  "fade-up",
+			Tip:   "fade-in",
+			CTA:   "fade-in",
+		}, true
 	case "bullets":
 		return animatedPreset{
 			Title: "fade-in",
diff --git a/internal/render/animated_test.go b/internal/render/animated_test.go
index cae948e..4a980cc 100644
--- a/internal/render/animated_test.go
+++ b/internal/render/animated_test.go
@@ -129,7 +129,7 @@ func TestFrameTimesCapsRenderedFramesForPerformance(t *testing.T) {
 }
 
 func TestDefaultVariantPresetExistsForEverySupportedVariant(t *testing.T) {
-	for _, variant := range []string{"cover", "quote", "image-caption", "bullets", "compare", "gallery-steps", "ending"} {
+	for _, variant := range []string{"cover", "quote", "image-caption", "text-caption", "bullets", "compare", "gallery-steps", "ending"} {
 		if _, ok := defaultAnimatedPreset(variant); !ok {
 			t.Fatalf("missing preset for %q", variant)
 		}
diff --git a/internal/render/assets/base.css b/internal/render/assets/base.css
index 307a2e6..3758136 100644
--- a/internal/render/assets/base.css
+++ b/internal/render/assets/base.css
@@ -333,19 +333,20 @@ html, body {
 }
 
 .image-frame {
-    background: var(--white);
+    background: transparent;
     border: 2px solid var(--line);
     border-radius: 42px;
-    padding: 18px;
+    padding: 0;
+    overflow: hidden;
 }
 
 .image-frame img {
     width: 100%;
     height: 100%;
-    object-fit: contain;
-    border-radius: 28px;
+    object-fit: cover;
+    border-radius: 40px;
     display: block;
-    background: #fff;
+    background: transparent;
 }
 
 .image-caption-layout {
@@ -441,6 +442,27 @@ html, body {
     height: 1220px;
 }
 
+.image-caption-text-card {
+    flex: 1 1 auto;
+    min-height: 0;
+    padding: 54px 52px;
+    display: flex;
+}
+
+.image-caption-text-wrap {
+    flex: 1 1 auto;
+    min-height: 0;
+    width: 100%;
+}
+
+.image-caption-text-card .quote-bar {
+    height: 220px;
+}
+
+.image-caption-text-caption {
+    color: var(--text);
+}
+
 .image-caption-layout.image-caption-no-image.content-fit-roomy {
     --image-caption-gap: 34px;
     --caption-font-size: 44px;
@@ -551,6 +573,61 @@ html, body {
     --code-line-height: 1.12;
 }
 
+.text-caption-layout {
+    --caption-font-size: 38px;
+    --caption-line-height: 1.55;
+    --code-block-margin-top: 24px;
+    --code-block-padding-y: 20px;
+    --code-block-padding-x: 22px;
+    --code-font-size: 24px;
+    --code-line-height: 1.45;
+    margin-top: 42px;
+    display: flex;
+    flex-direction: column;
+    gap: 28px;
+}
+
+.text-caption-card {
+    flex: 0 0 auto;
+    min-height: 0;
+    padding: 54px 52px;
+    display: flex;
+}
+
+.text-caption-wrap {
+    flex: 1 1 auto;
+    min-height: 0;
+    width: 100%;
+}
+
+.text-caption-wrap .quote-bar {
+    height: 220px;
+}
+
+.text-caption-copy {
+    color: var(--text);
+    font-size: var(--caption-font-size);
+    line-height: var(--caption-line-height);
+    font-weight: 600;
+    overflow-wrap: anywhere;
+    word-break: break-word;
+}
+
+.text-caption-copy .code-block {
+    margin-top: var(--code-block-margin-top);
+    padding: var(--code-block-padding-y) var(--code-block-padding-x);
+    font-size: var(--code-font-size);
+    line-height: var(--code-line-height);
+}
+
+.text-caption-cta {
+    position: static;
+    margin-top: 0;
+    left: auto;
+    right: auto;
+    bottom: auto;
+}
+
 .bullets {
     margin-top: 56px;
     display: grid;
diff --git a/internal/render/assets/page.tmpl b/internal/render/assets/page.tmpl
index 3fcda8c..4435cc3 100644
--- a/internal/render/assets/page.tmpl
+++ b/internal/render/assets/page.tmpl
@@ -10,7 +10,7 @@
   <div class="page">
     <div class="header-row">
       <span class="pill page-badge{{animClass .RenderMode.Animated .RenderMode.Preset.Badge}}">{{.Page.Meta.Badge}}</span>
-      <div class="page-no page-counter">{{.Page.Meta.Counter}}</div>
+      <div class="page-counter">{{.Page.Meta.Counter}}</div>
     </div>
     {{if .ShowWatermark}}
     <div class="watermark {{.WatermarkClass}}">{{.WatermarkText}}</div>
@@ -52,14 +52,25 @@
       <div class="cta-bar cta-strong"><span class="pill{{animClass .RenderMode.Animated .RenderMode.Preset.CTA}}">{{renderRichText .Rich.CTA}}</span></div>
     {{else if eq .Page.Variant "image-caption"}}
       <div class="title-lg{{animClass .RenderMode.Animated .RenderMode.Preset.Title}}">{{renderRichText .Rich.Title}}</div>
-      <div class="image-caption-layout{{if not .Page.Content.Images}} image-caption-no-image{{end}}{{contentFitClass .Page.Content.Body}}"{{if not .Page.Content.Images}} data-fit-auto="image-caption"{{end}}>
-        {{if .Page.Content.Images}}
+      <div class="image-caption-layout{{contentFitClass .Page.Content.Body}}">
         <div class="image-frame image-caption-image{{animClass .RenderMode.Animated .RenderMode.Preset.Image}}"><img src="{{imageSrc (index .Page.Content.Images 0).Src}}" alt="{{(index .Page.Content.Images 0).Alt}}" /></div>
-        {{end}}
         {{if .Page.Content.Body}}
         <div class="caption{{animClass .RenderMode.Animated .RenderMode.Preset.Body}}">{{renderRichText .Rich.Body}}</div>
         {{end}}
-        <div class="cta-bar image-caption-cta"><span class="pill{{animClass .RenderMode.Animated .RenderMode.Preset.CTA}}">{{renderRichText .Rich.CTA}}</span></div>
+      </div>
+    {{else if eq .Page.Variant "text-caption"}}
+      <div class="title-lg{{animClass .RenderMode.Animated .RenderMode.Preset.Title}}">{{renderRichText .Rich.Title}}</div>
+      <div class="text-caption-layout">
+        <div class="card quote-card text-caption-card{{animClass .RenderMode.Animated .RenderMode.Preset.Body}}">
+          <div class="quote-wrap text-caption-wrap">
+            <div class="quote-bar"></div>
+            <div class="text-caption-copy">{{renderRichText .Rich.Body}}</div>
+          </div>
+        </div>
+        {{if .Page.Content.Tip}}
+        <div class="tip-box{{animClass .RenderMode.Animated .RenderMode.Preset.Tip}}">{{renderRichText .Rich.Tip}}</div>
+        {{end}}
+        <div class="cta-bar text-caption-cta"><span class="pill{{animClass .RenderMode.Animated .RenderMode.Preset.CTA}}">{{renderRichText .Rich.CTA}}</span></div>
       </div>
     {{else if eq .Page.Variant "bullets"}}
       <div class="title-lg{{animClass .RenderMode.Animated .RenderMode.Preset.Title}}">{{renderRichText .Rich.Title}}</div>
diff --git a/internal/render/template.go b/internal/render/template.go
index a4dfbb9..ddcf2b3 100644
--- a/internal/render/template.go
+++ b/internal/render/template.go
@@ -217,6 +217,11 @@ func withVariantData(page deck.Page) (deck.Page, error) {
 		}
 		return page, nil
 	case "image-caption":
+		if len(page.Content.Images) != 1 {
+			return deck.Page{}, fmt.Errorf("variant %q requires exactly one image for page %q", page.Variant, page.Name)
+		}
+		return page, nil
+	case "text-caption":
 		return page, nil
 	case "gallery-steps":
 		target := len(page.Content.Steps)
diff --git a/internal/render/template_test.go b/internal/render/template_test.go
index 7bc5cda..b250528 100644
--- a/internal/render/template_test.go
+++ b/internal/render/template_test.go
@@ -107,7 +107,7 @@ func TestRenderHTMLIncludesBadgeCounterAndCTA(t *testing.T) {
 		d.Pages[0].Content.Title,
 		`class="header-row"`,
 		`class="pill page-badge"`,
-		`class="page-no page-counter"`,
+		`class="page-counter"`,
 		`class="cta-bar cover-cta"`,
 	}
 	for _, want := range mustContain {
@@ -115,6 +115,9 @@ func TestRenderHTMLIncludesBadgeCounterAndCTA(t *testing.T) {
 			t.Fatalf("html missing %q", want)
 		}
 	}
+	if strings.Contains(html, `class="page-no page-counter"`) {
+		t.Fatalf("page counter should stay in the header instead of bottom page-no: %s", html)
+	}
 }
 
 func TestRenderHTMLCoverUsesDynamicTitleAndSubtitle(t *testing.T) {
@@ -437,7 +440,7 @@ func mustExtractContainerHTML(t *testing.T, html string, marker string) string {
 	return ""
 }
 
-func TestRenderHTMLImageCaptionWrapsBodyAndCTAInContentColumn(t *testing.T) {
+func TestRenderHTMLImageCaptionRendersImageAndBodyWithoutBottomCTA(t *testing.T) {
 	d := deck.DefaultDeck("/tmp/out")
 	page := deck.Page{
 		Name:    "p05-image-caption",
@@ -466,9 +469,10 @@ func TestRenderHTMLImageCaptionWrapsBodyAndCTAInContentColumn(t *testing.T) {
 		`flex-direction: column;`,
 		`.image-caption-image {`,
 		`height: 760px;`,
-		`.image-caption-cta {`,
-		`position: static;`,
-		`margin-top: auto;`,
+		`.image-frame {`,
+		`padding: 0;`,
+		`overflow: hidden;`,
+		`object-fit: cover;`,
 	} {
 		if !strings.Contains(html, want) {
 			t.Fatalf("html missing image-caption layout css %q", want)
@@ -478,25 +482,69 @@ func TestRenderHTMLImageCaptionWrapsBodyAndCTAInContentColumn(t *testing.T) {
 	for _, want := range []string{
 		`class="image-frame image-caption-image"`,
 		`<div class="caption">`,
-		`class="cta-bar image-caption-cta"`,
 	} {
 		if !strings.Contains(container, want) {
 			t.Fatalf("image-caption container missing %q: %s", want, container)
 		}
 	}
+	for _, unwanted := range []string{`class="cta-bar image-caption-cta"`, "把风险拆开，工作流就更稳"} {
+		if strings.Contains(container, unwanted) {
+			t.Fatalf("image-caption should not render bottom CTA %q: %s", unwanted, container)
+		}
+	}
 	imageIndex := strings.Index(container, `class="image-frame image-caption-image`)
 	captionIndex := strings.Index(container, `<div class="caption">`)
-	ctaIndex := strings.Index(container, `class="cta-bar image-caption-cta"`)
-	if !(imageIndex >= 0 && captionIndex > imageIndex && ctaIndex > captionIndex) {
-		t.Fatalf("image-caption layout should render image, caption, then cta in order: %s", container)
+	if !(imageIndex >= 0 && captionIndex > imageIndex) {
+		t.Fatalf("image-caption layout should render image, then caption in order: %s", container)
 	}
 }
 
-func TestRenderHTMLImageCaptionKeepsCTAInsideLayoutWithoutImage(t *testing.T) {
+func TestRenderHTMLTextCaptionUsesContinuousNewsCopyCard(t *testing.T) {
 	d := deck.DefaultDeck("/tmp/out")
 	page := deck.Page{
-		Name:    "p05-image-caption",
-		Variant: "image-caption",
+		Name:    "p05-text-caption",
+		Variant: "text-caption",
+		Meta: deck.PageMeta{
+			Badge:   "第 5 页",
+			Counter: "5/6",
+			Theme:   "green",
+			CTA:     "无图也保留观点卡节奏",
+		},
+		Content: deck.PageContent{
+			Title: "纯文字图文页",
+			Body:  "**摘要：** 只有正文，也应该有像 quote 一样的视觉重心。\n\n**影响：** 少一层副标题，让正文更聚焦。",
+		},
+	}
+
+	html, err := RenderPageHTML(d, page)
+	if err != nil {
+		t.Fatalf("RenderPageHTML() error = %v", err)
+	}
+	container := mustExtractContainerHTML(t, html, `<div class="text-caption-layout"`)
+	for _, want := range []string{
+		`class="card quote-card text-caption-card"`,
+		`class="quote-wrap text-caption-wrap"`,
+		`class="quote-bar"`,
+		`class="text-caption-copy"`,
+		`font-size: var(--caption-font-size);`,
+		`line-height: var(--caption-line-height);`,
+	} {
+		if !strings.Contains(html, want) && !strings.Contains(container, want) {
+			t.Fatalf("text-caption card missing %q: %s", want, container)
+		}
+	}
+	for _, unwanted := range []string{`class="text-caption-section"`, `class="text-caption-label"`, `quote-main`} {
+		if strings.Contains(container, unwanted) {
+			t.Fatalf("text-caption should render continuous copy without %q: %s", unwanted, container)
+		}
+	}
+}
+
+func TestRenderHTMLTextCaptionKeepsCTAInsideLayout(t *testing.T) {
+	d := deck.DefaultDeck("/tmp/out")
+	page := deck.Page{
+		Name:    "p05-text-caption",
+		Variant: "text-caption",
 		Meta: deck.PageMeta{
 			Badge:   "第 5 页",
 			Counter: "5/6",
@@ -505,7 +553,7 @@ func TestRenderHTMLImageCaptionKeepsCTAInsideLayoutWithoutImage(t *testing.T) {
 		},
 		Content: deck.PageContent{
 			Title: "纯文字图文页",
-			Body:  "只有正文，也应该保持清晰的阅读顺序。",
+			Body:  "**摘要：** 只有正文，也应该保持清晰的阅读顺序。\n\n**影响：** 底部 CTA 保持在同一列里。",
 		},
 	}
 
@@ -513,31 +561,42 @@ func TestRenderHTMLImageCaptionKeepsCTAInsideLayoutWithoutImage(t *testing.T) {
 	if err != nil {
 		t.Fatalf("RenderPageHTML() error = %v", err)
 	}
-	for _, want := range []string{`.image-caption-layout {`, `.image-caption-cta {`, `margin-top: auto;`} {
+	for _, want := range []string{
+		`.text-caption-layout {`,
+		`.text-caption-card {`,
+		`flex: 0 0 auto;`,
+		`.text-caption-cta {`,
+		`margin-top: 0;`,
+	} {
 		if !strings.Contains(html, want) {
-			t.Fatalf("html missing image-caption layout css %q", want)
+			t.Fatalf("html missing text-caption snug layout css %q", want)
 		}
 	}
-	container := mustExtractContainerHTML(t, html, `<div class="image-caption-layout image-caption-no-image"`)
+	for _, unwanted := range []string{`.text-caption-layout {\n    height: 1220px;`, `.text-caption-cta {\n    position: static;\n    margin-top: auto;`} {
+		if strings.Contains(html, unwanted) {
+			t.Fatalf("text-caption should not reserve fixed empty space %q", unwanted)
+		}
+	}
+	container := mustExtractContainerHTML(t, html, `<div class="text-caption-layout`)
 	if strings.Contains(container, `class="image-frame image-caption-image`) {
-		t.Fatalf("html should not render image block when no image is provided: %s", container)
+		t.Fatalf("text-caption should not render image block: %s", container)
 	}
-	captionIndex := strings.Index(container, `<div class="caption">`)
-	ctaIndex := strings.Index(container, `class="cta-bar image-caption-cta"`)
-	if !(captionIndex >= 0 && ctaIndex > captionIndex) {
-		t.Fatalf("image-caption without image should render caption before cta: %s", container)
+	copyIndex := strings.Index(container, `class="text-caption-copy"`)
+	ctaIndex := strings.Index(container, `class="cta-bar text-caption-cta"`)
+	if !(copyIndex >= 0 && ctaIndex > copyIndex) {
+		t.Fatalf("text-caption should render continuous copy before cta: %s", container)
 	}
 }
 
-func TestRenderHTMLImageCaptionWithoutImageEnablesAutoFit(t *testing.T) {
+func TestRenderHTMLTextCaptionUsesStableNewsFontSize(t *testing.T) {
 	d := deck.DefaultDeck("/tmp/out")
 	page := deck.Page{
-		Name:    "p03-image-caption",
-		Variant: "image-caption",
+		Name:    "p03-text-caption",
+		Variant: "text-caption",
 		Meta:    deck.PageMeta{Badge: "第 3 页", Counter: "3/12", Theme: "default", CTA: "开源代码好自查"},
 		Content: deck.PageContent{
 			Title: "开源代码好自查",
-			Body:  "在本机安装的 OpenClaw 里，找到了这样一段 suppression：\n\n```text\nprovider: openai-codex\nmodel: gpt-5.3-codex-spark\n```",
+			Body:  "**摘要：** 在本机安装的 OpenClaw 里，找到了这样一段 suppression：\n\n```text\nprovider: openai-codex\nmodel: gpt-5.3-codex-spark\n```\n\n**影响：** 需要把命令和判断分块展示。" + strings.Repeat("补充说明。", 30),
 		},
 	}
 
@@ -546,27 +605,35 @@ func TestRenderHTMLImageCaptionWithoutImageEnablesAutoFit(t *testing.T) {
 		t.Fatalf("RenderPageHTML() error = %v", err)
 	}
 	for _, want := range []string{
-		`class="image-caption-layout image-caption-no-image`,
-		`data-fit-auto="image-caption"`,
-		`function applyImageCaptionAutoFit()`,
-		`content-fit-roomy`,
-		`content-fit-balanced`,
+		`class="text-caption-layout"`,
+		`class="text-caption-copy"`,
+		`--caption-font-size: 38px;`,
+		`font-size: var(--caption-font-size);`,
+		`line-height: var(--caption-line-height);`,
 	} {
 		if !strings.Contains(html, want) {
-			t.Fatalf("html missing auto-fit marker %q", want)
+			t.Fatalf("html missing stable text-caption marker %q", want)
+		}
+	}
+	if strings.Contains(html, `class="text-caption-layout content-fit-`) {
+		t.Fatalf("text-caption should not shrink news font via content-fit class: %s", html)
+	}
+	for _, unwanted := range []string{`class="text-caption-section"`, `class="text-caption-label"`} {
+		if strings.Contains(html, unwanted) {
+			t.Fatalf("text-caption should not render split sections %q: %s", unwanted, html)
 		}
 	}
 }
 
-func TestRenderHTMLImageCaptionWrapsLongPlainText(t *testing.T) {
+func TestRenderHTMLTextCaptionWrapsLongPlainText(t *testing.T) {
 	d := deck.DefaultDeck("/tmp/out")
 	page := deck.Page{
-		Name:    "p04-image-caption",
-		Variant: "image-caption",
+		Name:    "p04-text-caption",
+		Variant: "text-caption",
 		Meta:    deck.PageMeta{Badge: "第 4 页", Counter: "4/12", Theme: "default", CTA: "链接也要完整"},
 		Content: deck.PageContent{
 			Title: "长链接不能被裁掉",
-			Body:  "https://github.com/openclaw/openclaw/issues/46734",
+			Body:  "**摘要：** https://github.com/openclaw/openclaw/issues/46734",
 		},
 	}
 
@@ -577,6 +644,7 @@ func TestRenderHTMLImageCaptionWrapsLongPlainText(t *testing.T) {
 	for _, want := range []string{
 		`overflow-wrap: anywhere;`,
 		`word-break: break-word;`,
+		`.text-caption-copy {`,
 	} {
 		if !strings.Contains(html, want) {
 			t.Fatalf("html missing long plain text wrap CSS %q", want)
@@ -584,15 +652,15 @@ func TestRenderHTMLImageCaptionWrapsLongPlainText(t *testing.T) {
 	}
 }
 
-func TestRenderHTMLImageCaptionAutoFitChecksHorizontalOverflow(t *testing.T) {
+func TestRenderHTMLTextCaptionWrapsHorizontalOverflow(t *testing.T) {
 	d := deck.DefaultDeck("/tmp/out")
 	page := deck.Page{
-		Name:    "p04-image-caption",
-		Variant: "image-caption",
+		Name:    "p04-text-caption",
+		Variant: "text-caption",
 		Meta:    deck.PageMeta{Badge: "第 4 页", Counter: "4/12", Theme: "default", CTA: "链接也要完整"},
 		Content: deck.PageContent{
 			Title: "长链接不能被裁掉",
-			Body:  "https://github.com/openclaw/openclaw/issues/46734",
+			Body:  "**摘要：** https://github.com/openclaw/openclaw/issues/46734",
 		},
 	}
 
@@ -601,25 +669,25 @@ func TestRenderHTMLImageCaptionAutoFitChecksHorizontalOverflow(t *testing.T) {
 		t.Fatalf("RenderPageHTML() error = %v", err)
 	}
 	for _, want := range []string{
-		`layout.scrollWidth <= layout.clientWidth + 1`,
-		`page.scrollWidth <= page.clientWidth + 1`,
-		`caption.scrollWidth <= caption.clientWidth + 1`,
+		`.text-caption-copy {`,
+		`overflow-wrap: anywhere;`,
+		`word-break: break-word;`,
 	} {
 		if !strings.Contains(html, want) {
-			t.Fatalf("html missing horizontal auto-fit check %q", want)
+			t.Fatalf("html missing horizontal wrap marker %q", want)
 		}
 	}
 }
 
-func TestRenderHTMLImageCaptionAutoFitDetectsCodeHeavyPages(t *testing.T) {
+func TestRenderHTMLTextCaptionScalesCodeHeavyPages(t *testing.T) {
 	d := deck.DefaultDeck("/tmp/out")
 	page := deck.Page{
-		Name:    "p07-image-caption",
-		Variant: "image-caption",
+		Name:    "p07-text-caption",
+		Variant: "text-caption",
 		Meta:    deck.PageMeta{Badge: "第 7 页", Counter: "7/12", Theme: "default", CTA: "临时补丁自己打"},
 		Content: deck.PageContent{
 			Title: "开源补丁自己打",
-			Body:  "说明\n\n```python\nimport json\nfrom pathlib import Path\npath = Path('/tmp/openclaw.plugin.json')\ndata = json.loads(path.read_text())\nmodels = data['providers']['openai-codex'].setdefault('models', [])\nmodels.append({'id': 'gpt-5.3-codex-spark'})\npath.write_text(json.dumps(data))\n```",
+			Body:  "**摘要：** 说明\n\n```python\nimport json\nfrom pathlib import Path\npath = Path('/tmp/openclaw.plugin.json')\ndata = json.loads(path.read_text())\nmodels = data['providers']['openai-codex'].setdefault('models', [])\nmodels.append({'id': 'gpt-5.3-codex-spark'})\npath.write_text(json.dumps(data))\n```\n\n**影响：** 代码块也要保持可读。",
 		},
 	}
 
@@ -628,17 +696,17 @@ func TestRenderHTMLImageCaptionAutoFitDetectsCodeHeavyPages(t *testing.T) {
 		t.Fatalf("RenderPageHTML() error = %v", err)
 	}
 	for _, want := range []string{
-		`var codeBlocks = caption.querySelectorAll('.code-block');`,
-		`layout.classList.toggle('code-heavy', codeBlocks.length > 0);`,
-		`.image-caption-layout.image-caption-no-image.code-heavy.content-fit-dense {`,
-		`--code-font-size: 18px;`,
-		`.image-caption-layout.image-caption-no-image.code-heavy.content-fit-ultra {`,
-		`--code-font-size: 16px;`,
+		`.text-caption-copy .code-block {`,
+		`font-size: var(--code-font-size);`,
+		`path = Path(&#39;/tmp/openclaw.plugin.json&#39;)`,
 	} {
 		if !strings.Contains(html, want) {
-			t.Fatalf("html missing code-heavy fit marker %q", want)
+			t.Fatalf("html missing text-caption code marker %q", want)
 		}
 	}
+	if strings.Contains(html, `.text-caption-layout.content-fit-dense`) {
+		t.Fatalf("text-caption should not use dense fit styles: %s", html)
+	}
 }
 
 func TestRenderHTMLImageCaptionWithImageKeepsStaticFitOnly(t *testing.T) {
@@ -669,11 +737,11 @@ func TestRenderHTMLImageCaptionWithImageKeepsStaticFitOnly(t *testing.T) {
 	}
 }
 
-func TestRenderHTMLIncludesImageCaptionAutoFitCandidateStyles(t *testing.T) {
+func TestRenderHTMLTextCaptionOmitsFitCandidateStyles(t *testing.T) {
 	d := deck.DefaultDeck("/tmp/out")
 	page := deck.Page{
-		Name:    "p03-image-caption",
-		Variant: "image-caption",
+		Name:    "p03-text-caption",
+		Variant: "text-caption",
 		Meta:    deck.PageMeta{Badge: "第 3 页", Counter: "3/12", Theme: "default", CTA: "开源代码好自查"},
 		Content: deck.PageContent{
 			Title: "开源代码好自查",
@@ -685,23 +753,24 @@ func TestRenderHTMLIncludesImageCaptionAutoFitCandidateStyles(t *testing.T) {
 	if err != nil {
 		t.Fatalf("RenderPageHTML() error = %v", err)
 	}
-	for _, want := range []string{
-		`--image-caption-gap: 34px;`,
-		`gap: var(--image-caption-gap);`,
-		`font-size: var(--caption-font-size);`,
-		`font-size: var(--code-font-size);`,
-		`.image-caption-layout.image-caption-no-image.content-fit-roomy {`,
-		`--caption-font-size: 44px;`,
-		`.image-caption-layout.image-caption-no-image.content-fit-ultra {`,
-		`--code-font-size: 13px;`,
+	for _, unwanted := range []string{
+		`.text-caption-layout.content-fit-compact`,
+		`.text-caption-layout.content-fit-dense`,
+		`.text-caption-layout.content-fit-ultra`,
+		`class="text-caption-layout content-fit-`,
 	} {
+		if strings.Contains(html, unwanted) {
+			t.Fatalf("text-caption should omit fit CSS marker %q: %s", unwanted, html)
+		}
+	}
+	for _, want := range []string{`.text-caption-card {`, `.text-caption-copy {`, `.text-caption-copy .code-block {`} {
 		if !strings.Contains(html, want) {
-			t.Fatalf("html missing auto-fit CSS variable marker %q", want)
+			t.Fatalf("html missing stable text-caption CSS marker %q", want)
 		}
 	}
 }
 
-func TestRenderHTMLImageCaptionRendersCTAAfterImageWhenBodyMissing(t *testing.T) {
+func TestRenderHTMLImageCaptionOmitsCTAWhenBodyMissing(t *testing.T) {
 	d := deck.DefaultDeck("/tmp/out")
 	page := deck.Page{
 		Name:    "p05-image-caption",
@@ -722,7 +791,7 @@ func TestRenderHTMLImageCaptionRendersCTAAfterImageWhenBodyMissing(t *testing.T)
 	if err != nil {
 		t.Fatalf("RenderPageHTML() error = %v", err)
 	}
-	for _, want := range []string{`.image-caption-layout {`, `.image-caption-image {`, `.image-caption-cta {`, `margin-top: auto;`} {
+	for _, want := range []string{`.image-caption-layout {`, `.image-caption-image {`} {
 		if !strings.Contains(html, want) {
 			t.Fatalf("html missing image-caption layout css %q", want)
 		}
@@ -731,10 +800,13 @@ func TestRenderHTMLImageCaptionRendersCTAAfterImageWhenBodyMissing(t *testing.T)
 	if strings.Contains(container, `<div class="caption">`) {
 		t.Fatalf("html should not render caption block when body is missing: %s", container)
 	}
-	imageIndex := strings.Index(container, `class="image-frame image-caption-image`)
-	ctaIndex := strings.Index(container, `class="cta-bar image-caption-cta"`)
-	if !(imageIndex >= 0 && ctaIndex > imageIndex) {
-		t.Fatalf("image-caption without body should render cta after image: %s", container)
+	for _, unwanted := range []string{`class="cta-bar image-caption-cta"`, "只有配图也要保留 CTA"} {
+		if strings.Contains(container, unwanted) {
+			t.Fatalf("image-caption should omit bottom CTA %q: %s", unwanted, container)
+		}
+	}
+	if !strings.Contains(container, `class="image-frame image-caption-image`) {
+		t.Fatalf("image-caption without body should still render image: %s", container)
 	}
 }
 
@@ -759,15 +831,15 @@ func TestRenderHTMLEndingUsesDynamicBody(t *testing.T) {
 	}
 }
 
-func TestRenderHTMLScalesLongImageCaptionBodyWithoutTruncatingCode(t *testing.T) {
+func TestRenderHTMLKeepsLongTextCaptionBodyWithoutTruncatingCode(t *testing.T) {
 	d := deck.DefaultDeck("/tmp/out")
 	page := deck.Page{
-		Name:    "p11-image-caption",
-		Variant: "image-caption",
+		Name:    "p11-text-caption",
+		Variant: "text-caption",
 		Meta:    deck.PageMeta{Badge: "第 11 页", Counter: "11/12", Theme: "green", CTA: "patch 前一定备份"},
 		Content: deck.PageContent{
 			Title: "如果列表里没有：临时 patch",
-			Body:  "说明\n\n```bash\npython3 - <<'PY'\nimport json\nimport shutil\nfrom pathlib import Path\nfrom datetime import datetime\npath = Path('/tmp/openclaw.plugin.json')\nbackup = path.with_name(path.name + '.bak')\nshutil.copy2(path, backup)\ndata = json.loads(path.read_text())\nmodels = data['providers']['openai-codex'].setdefault('models', [])\nmodels.append({'id': 'gpt-5.3-codex-spark'})\npath.write_text(json.dumps(data))\nprint(f'patched: {path}')\nprint(f'backup:  {backup}')\nPY\n```",
+			Body:  "**摘要：** 说明\n\n```bash\npython3 - <<'PY'\nimport json\nimport shutil\nfrom pathlib import Path\nfrom datetime import datetime\npath = Path('/tmp/openclaw.plugin.json')\nbackup = path.with_name(path.name + '.bak')\nshutil.copy2(path, backup)\ndata = json.loads(path.read_text())\nmodels = data['providers']['openai-codex'].setdefault('models', [])\nmodels.append({'id': 'gpt-5.3-codex-spark'})\npath.write_text(json.dumps(data))\nprint(f'patched: {path}')\nprint(f'backup:  {backup}')\nPY\n```\n\n**影响：** 代码块不能截断。",
 		},
 	}
 
@@ -776,15 +848,19 @@ func TestRenderHTMLScalesLongImageCaptionBodyWithoutTruncatingCode(t *testing.T)
 		t.Fatalf("RenderPageHTML() error = %v", err)
 	}
 	for _, want := range []string{
-		`class="image-caption-layout image-caption-no-image content-fit-ultra" data-fit-auto="image-caption"`,
-		`font-size: 12px;`,
+		`class="text-caption-layout"`,
+		`.text-caption-copy .code-block {`,
+		`font-size: var(--code-font-size);`,
 		`print(f&#39;patched: {path}&#39;)`,
 		`print(f&#39;backup:  {backup}&#39;)`,
 	} {
 		if !strings.Contains(html, want) {
-			t.Fatalf("html missing full-code scaling marker %q", want)
+			t.Fatalf("html missing full-code marker %q", want)
 		}
 	}
+	if strings.Contains(html, `class="text-caption-layout content-fit-`) {
+		t.Fatalf("text-caption should keep a stable news font instead of shrinking: %s", html)
+	}
 }
 
 func TestRenderHTMLEndingScalesLongBodyBeforeCTA(t *testing.T) {
@@ -991,12 +1067,12 @@ func TestRenderHTMLBodyRendersInlineCodeAndCodeBlock(t *testing.T) {
 	d.ThemeName = deck.ThemeTechNoir
 	d.Themes = deck.RegisteredThemes()
 	page := deck.Page{
-		Name:    "p03-image",
-		Variant: "image-caption",
+		Name:    "p03-text",
+		Variant: "text-caption",
 		Meta:    deck.PageMeta{Badge: "第 3 页", Counter: "3/3", Theme: "orange", CTA: "cta"},
 		Content: deck.PageContent{
-			Title: "图文页",
-			Body:  "先跑 `mark2note`\n```bash\nmark2note --input article.md --theme tech-noir\n```",
+			Title: "文字页",
+			Body:  "**摘要：** 先跑 `mark2note`\n\n```bash\nmark2note --input article.md --theme tech-noir\n```",
 		},
 	}
 
@@ -1112,7 +1188,8 @@ func TestRenderHTMLSupportsAllCurrentVariants(t *testing.T) {
 	markers := map[string]string{
 		"cover":         `class="cover-main"`,
 		"quote":         `class="card quote-card"`,
-		"image-caption": `class="caption"`,
+		"image-caption": `class="image-caption-layout`,
+		"text-caption":  `class="text-caption-layout`,
 		"bullets":       `class="bullets"`,
 		"compare":       `class="compare-rows"`,
 		"gallery-steps": `class="steps`,
@@ -1162,7 +1239,7 @@ func TestRenderHTMLFailsOnUnknownVariant(t *testing.T) {
 	}
 }
 
-func TestRenderHTMLOmitsImageFrameWhenImageCaptionHasNoImages(t *testing.T) {
+func TestRenderHTMLRejectsImageCaptionWithNoImages(t *testing.T) {
 	d := deck.DefaultDeck("/tmp/out")
 	page := deck.Page{
 		Name:    "p09-extra-image",
@@ -1179,15 +1256,12 @@ func TestRenderHTMLOmitsImageFrameWhenImageCaptionHasNoImages(t *testing.T) {
 		},
 	}
 
-	html, err := RenderPageHTML(d, page)
-	if err != nil {
-		t.Fatalf("RenderPageHTML() error = %v", err)
-	}
-	if strings.Contains(html, `class="image-frame"`) {
-		t.Fatalf("html should omit image frame when no images are provided: %s", html)
+	_, err := RenderPageHTML(d, page)
+	if err == nil {
+		t.Fatalf("RenderPageHTML() error = nil, want non-nil")
 	}
-	if strings.Contains(html, "data:image/svg") {
-		t.Fatalf("html should not render placeholder image when no images are provided: %s", html)
+	if !strings.Contains(err.Error(), `variant "image-caption" requires exactly one image`) {
+		t.Fatalf("error = %v", err)
 	}
 }
 
diff --git a/internal/render/testdata/fixtures/default-all-variants.json b/internal/render/testdata/fixtures/default-all-variants.json
index b1508c2..a4d78e3 100644
--- a/internal/render/testdata/fixtures/default-all-variants.json
+++ b/internal/render/testdata/fixtures/default-all-variants.json
@@ -6,7 +6,7 @@
       "variant": "cover",
       "meta": {
         "badge": "第 1 页",
-        "counter": "1/7",
+        "counter": "1/8",
         "theme": "orange",
         "cta": "cta1"
       },
@@ -20,7 +20,7 @@
       "variant": "quote",
       "meta": {
         "badge": "第 2 页",
-        "counter": "2/7",
+        "counter": "2/8",
         "theme": "orange",
         "cta": "cta2"
       },
@@ -36,21 +36,41 @@
       "variant": "image-caption",
       "meta": {
         "badge": "第 3 页",
-        "counter": "3/7",
+        "counter": "3/8",
         "theme": "orange",
         "cta": "cta3"
       },
       "content": {
         "title": "图文页",
-        "body": "图文说明"
+        "body": "图文说明",
+        "images": [
+          {
+            "src": "https://example.com/fixture-image.png",
+            "alt": "fixture image"
+          }
+        ]
       }
     },
     {
-      "name": "p04-bullets",
-      "variant": "bullets",
+      "name": "p04-text",
+      "variant": "text-caption",
       "meta": {
         "badge": "第 4 页",
-        "counter": "4/7",
+        "counter": "4/8",
+        "theme": "orange",
+        "cta": "cta4"
+      },
+      "content": {
+        "title": "文字页",
+        "body": "**摘要：** 无图新闻保留完整事实。\n\n**影响：** 单独说明后续判断。"
+      }
+    },
+    {
+      "name": "p05-bullets",
+      "variant": "bullets",
+      "meta": {
+        "badge": "第 5 页",
+        "counter": "5/8",
         "theme": "orange",
         "cta": "cta4"
       },
@@ -64,11 +84,11 @@
       }
     },
     {
-      "name": "p05-compare",
+      "name": "p06-compare",
       "variant": "compare",
       "meta": {
-        "badge": "第 5 页",
-        "counter": "5/7",
+        "badge": "第 6 页",
+        "counter": "6/8",
         "theme": "green",
         "cta": "cta5"
       },
@@ -87,11 +107,11 @@
       }
     },
     {
-      "name": "p06-gallery",
+      "name": "p07-gallery",
       "variant": "gallery-steps",
       "meta": {
-        "badge": "第 6 页",
-        "counter": "6/7",
+        "badge": "第 7 页",
+        "counter": "7/8",
         "theme": "green",
         "cta": "cta6"
       },
@@ -104,11 +124,11 @@
       }
     },
     {
-      "name": "p07-ending",
+      "name": "p08-ending",
       "variant": "ending",
       "meta": {
-        "badge": "第 7 页",
-        "counter": "7/7",
+        "badge": "第 8 页",
+        "counter": "8/8",
         "theme": "green",
         "cta": "cta7"
       },
diff --git a/internal/render/testdata/fixtures/default-semantic-highlight.json b/internal/render/testdata/fixtures/default-semantic-highlight.json
index 6d927fe..589f2da 100644
--- a/internal/render/testdata/fixtures/default-semantic-highlight.json
+++ b/internal/render/testdata/fixtures/default-semantic-highlight.json
@@ -32,8 +32,8 @@
       }
     },
     {
-      "name": "p03-image",
-      "variant": "image-caption",
+      "name": "p03-text",
+      "variant": "text-caption",
       "meta": {
         "badge": "第 3 页",
         "counter": "3/7",
@@ -41,8 +41,8 @@
         "cta": "看代码块示例"
       },
       "content": {
-        "title": "图文页",
-        "body": "先执行命令：\n```bash\nmark2note --input article.md --theme default\n```"
+        "title": "文字页",
+        "body": "**摘要：** 先执行命令：\n```bash\nmark2note --input article.md --theme default\n```"
       }
     },
     {
diff --git a/internal/render/testdata/fixtures/editorial-cool-all-variants.json b/internal/render/testdata/fixtures/editorial-cool-all-variants.json
index 041b9a2..43a8b59 100644
--- a/internal/render/testdata/fixtures/editorial-cool-all-variants.json
+++ b/internal/render/testdata/fixtures/editorial-cool-all-variants.json
@@ -6,7 +6,7 @@
       "variant": "cover",
       "meta": {
         "badge": "第 1 页",
-        "counter": "1/7",
+        "counter": "1/8",
         "theme": "orange",
         "cta": "cta1"
       },
@@ -20,7 +20,7 @@
       "variant": "quote",
       "meta": {
         "badge": "第 2 页",
-        "counter": "2/7",
+        "counter": "2/8",
         "theme": "orange",
         "cta": "cta2"
       },
@@ -36,21 +36,41 @@
       "variant": "image-caption",
       "meta": {
         "badge": "第 3 页",
-        "counter": "3/7",
+        "counter": "3/8",
         "theme": "orange",
         "cta": "cta3"
       },
       "content": {
         "title": "冷调图文",
-        "body": "冷调说明"
+        "body": "冷调说明",
+        "images": [
+          {
+            "src": "https://example.com/fixture-image.png",
+            "alt": "fixture image"
+          }
+        ]
       }
     },
     {
-      "name": "p04-bullets",
-      "variant": "bullets",
+      "name": "p04-text",
+      "variant": "text-caption",
       "meta": {
         "badge": "第 4 页",
-        "counter": "4/7",
+        "counter": "4/8",
+        "theme": "orange",
+        "cta": "cta4"
+      },
+      "content": {
+        "title": "文字页",
+        "body": "**摘要：** 无图新闻保留完整事实。\n\n**影响：** 单独说明后续判断。"
+      }
+    },
+    {
+      "name": "p05-bullets",
+      "variant": "bullets",
+      "meta": {
+        "badge": "第 5 页",
+        "counter": "5/8",
         "theme": "orange",
         "cta": "cta4"
       },
@@ -64,11 +84,11 @@
       }
     },
     {
-      "name": "p05-compare",
+      "name": "p06-compare",
       "variant": "compare",
       "meta": {
-        "badge": "第 5 页",
-        "counter": "5/7",
+        "badge": "第 6 页",
+        "counter": "6/8",
         "theme": "green",
         "cta": "cta5"
       },
@@ -87,11 +107,11 @@
       }
     },
     {
-      "name": "p06-gallery",
+      "name": "p07-gallery",
       "variant": "gallery-steps",
       "meta": {
-        "badge": "第 6 页",
-        "counter": "6/7",
+        "badge": "第 7 页",
+        "counter": "7/8",
         "theme": "green",
         "cta": "cta6"
       },
@@ -104,11 +124,11 @@
       }
     },
     {
-      "name": "p07-ending",
+      "name": "p08-ending",
       "variant": "ending",
       "meta": {
-        "badge": "第 7 页",
-        "counter": "7/7",
+        "badge": "第 8 页",
+        "counter": "8/8",
         "theme": "green",
         "cta": "cta7"
       },
diff --git a/internal/render/testdata/fixtures/editorial-cool-semantic-highlight.json b/internal/render/testdata/fixtures/editorial-cool-semantic-highlight.json
index 0e339ea..1dde283 100644
--- a/internal/render/testdata/fixtures/editorial-cool-semantic-highlight.json
+++ b/internal/render/testdata/fixtures/editorial-cool-semantic-highlight.json
@@ -32,8 +32,8 @@
       }
     },
     {
-      "name": "p03-image",
-      "variant": "image-caption",
+      "name": "p03-text",
+      "variant": "text-caption",
       "meta": {
         "badge": "第 3 页",
         "counter": "3/7",
@@ -41,8 +41,8 @@
         "cta": "看代码块示例"
       },
       "content": {
-        "title": "图文页",
-        "body": "先执行命令：\n```bash\nmark2note --input article.md --theme default\n```"
+        "title": "文字页",
+        "body": "**摘要：** 先执行命令：\n```bash\nmark2note --input article.md --theme default\n```"
       }
     },
     {
diff --git a/internal/render/testdata/fixtures/fresh-green-all-variants.json b/internal/render/testdata/fixtures/fresh-green-all-variants.json
index 332af0e..7fd0cd4 100644
--- a/internal/render/testdata/fixtures/fresh-green-all-variants.json
+++ b/internal/render/testdata/fixtures/fresh-green-all-variants.json
@@ -6,7 +6,7 @@
       "variant": "cover",
       "meta": {
         "badge": "第 1 页",
-        "counter": "1/7",
+        "counter": "1/8",
         "theme": "orange",
         "cta": "cta1"
       },
@@ -20,7 +20,7 @@
       "variant": "quote",
       "meta": {
         "badge": "第 2 页",
-        "counter": "2/7",
+        "counter": "2/8",
         "theme": "orange",
         "cta": "cta2"
       },
@@ -36,21 +36,41 @@
       "variant": "image-caption",
       "meta": {
         "badge": "第 3 页",
-        "counter": "3/7",
+        "counter": "3/8",
         "theme": "orange",
         "cta": "cta3"
       },
       "content": {
         "title": "暖纸图文",
-        "body": "暖纸说明"
+        "body": "暖纸说明",
+        "images": [
+          {
+            "src": "https://example.com/fixture-image.png",
+            "alt": "fixture image"
+          }
+        ]
       }
     },
     {
-      "name": "p04-bullets",
-      "variant": "bullets",
+      "name": "p04-text",
+      "variant": "text-caption",
       "meta": {
         "badge": "第 4 页",
-        "counter": "4/7",
+        "counter": "4/8",
+        "theme": "orange",
+        "cta": "cta4"
+      },
+      "content": {
+        "title": "文字页",
+        "body": "**摘要：** 无图新闻保留完整事实。\n\n**影响：** 单独说明后续判断。"
+      }
+    },
+    {
+      "name": "p05-bullets",
+      "variant": "bullets",
+      "meta": {
+        "badge": "第 5 页",
+        "counter": "5/8",
         "theme": "orange",
         "cta": "cta4"
       },
@@ -64,11 +84,11 @@
       }
     },
     {
-      "name": "p05-compare",
+      "name": "p06-compare",
       "variant": "compare",
       "meta": {
-        "badge": "第 5 页",
-        "counter": "5/7",
+        "badge": "第 6 页",
+        "counter": "6/8",
         "theme": "green",
         "cta": "cta5"
       },
@@ -87,11 +107,11 @@
       }
     },
     {
-      "name": "p06-gallery",
+      "name": "p07-gallery",
       "variant": "gallery-steps",
       "meta": {
-        "badge": "第 6 页",
-        "counter": "6/7",
+        "badge": "第 7 页",
+        "counter": "7/8",
         "theme": "green",
         "cta": "cta6"
       },
@@ -104,11 +124,11 @@
       }
     },
     {
-      "name": "p07-ending",
+      "name": "p08-ending",
       "variant": "ending",
       "meta": {
-        "badge": "第 7 页",
-        "counter": "7/7",
+        "badge": "第 8 页",
+        "counter": "8/8",
         "theme": "green",
         "cta": "cta7"
       },
diff --git a/internal/render/testdata/fixtures/plum-ink-all-variants.json b/internal/render/testdata/fixtures/plum-ink-all-variants.json
index 1fcd7ec..a37b555 100644
--- a/internal/render/testdata/fixtures/plum-ink-all-variants.json
+++ b/internal/render/testdata/fixtures/plum-ink-all-variants.json
@@ -6,7 +6,7 @@
       "variant": "cover",
       "meta": {
         "badge": "第 1 页",
-        "counter": "1/7",
+        "counter": "1/8",
         "theme": "orange",
         "cta": "cta1"
       },
@@ -20,7 +20,7 @@
       "variant": "quote",
       "meta": {
         "badge": "第 2 页",
-        "counter": "2/7",
+        "counter": "2/8",
         "theme": "orange",
         "cta": "cta2"
       },
@@ -36,21 +36,41 @@
       "variant": "image-caption",
       "meta": {
         "badge": "第 3 页",
-        "counter": "3/7",
+        "counter": "3/8",
         "theme": "orange",
         "cta": "cta3"
       },
       "content": {
         "title": "暖纸图文",
-        "body": "暖纸说明"
+        "body": "暖纸说明",
+        "images": [
+          {
+            "src": "https://example.com/fixture-image.png",
+            "alt": "fixture image"
+          }
+        ]
       }
     },
     {
-      "name": "p04-bullets",
-      "variant": "bullets",
+      "name": "p04-text",
+      "variant": "text-caption",
       "meta": {
         "badge": "第 4 页",
-        "counter": "4/7",
+        "counter": "4/8",
+        "theme": "orange",
+        "cta": "cta4"
+      },
+      "content": {
+        "title": "文字页",
+        "body": "**摘要：** 无图新闻保留完整事实。\n\n**影响：** 单独说明后续判断。"
+      }
+    },
+    {
+      "name": "p05-bullets",
+      "variant": "bullets",
+      "meta": {
+        "badge": "第 5 页",
+        "counter": "5/8",
         "theme": "orange",
         "cta": "cta4"
       },
@@ -64,11 +84,11 @@
       }
     },
     {
-      "name": "p05-compare",
+      "name": "p06-compare",
       "variant": "compare",
       "meta": {
-        "badge": "第 5 页",
-        "counter": "5/7",
+        "badge": "第 6 页",
+        "counter": "6/8",
         "theme": "green",
         "cta": "cta5"
       },
@@ -87,11 +107,11 @@
       }
     },
     {
-      "name": "p06-gallery",
+      "name": "p07-gallery",
       "variant": "gallery-steps",
       "meta": {
-        "badge": "第 6 页",
-        "counter": "6/7",
+        "badge": "第 7 页",
+        "counter": "7/8",
         "theme": "green",
         "cta": "cta6"
       },
@@ -104,11 +124,11 @@
       }
     },
     {
-      "name": "p07-ending",
+      "name": "p08-ending",
       "variant": "ending",
       "meta": {
-        "badge": "第 7 页",
-        "counter": "7/7",
+        "badge": "第 8 页",
+        "counter": "8/8",
         "theme": "green",
         "cta": "cta7"
       },
diff --git a/internal/render/testdata/fixtures/sage-mist-all-variants.json b/internal/render/testdata/fixtures/sage-mist-all-variants.json
index 18ba264..28a70f3 100644
--- a/internal/render/testdata/fixtures/sage-mist-all-variants.json
+++ b/internal/render/testdata/fixtures/sage-mist-all-variants.json
@@ -6,7 +6,7 @@
       "variant": "cover",
       "meta": {
         "badge": "第 1 页",
-        "counter": "1/7",
+        "counter": "1/8",
         "theme": "orange",
         "cta": "cta1"
       },
@@ -20,7 +20,7 @@
       "variant": "quote",
       "meta": {
         "badge": "第 2 页",
-        "counter": "2/7",
+        "counter": "2/8",
         "theme": "orange",
         "cta": "cta2"
       },
@@ -36,21 +36,41 @@
       "variant": "image-caption",
       "meta": {
         "badge": "第 3 页",
-        "counter": "3/7",
+        "counter": "3/8",
         "theme": "orange",
         "cta": "cta3"
       },
       "content": {
         "title": "暖纸图文",
-        "body": "暖纸说明"
+        "body": "暖纸说明",
+        "images": [
+          {
+            "src": "https://example.com/fixture-image.png",
+            "alt": "fixture image"
+          }
+        ]
       }
     },
     {
-      "name": "p04-bullets",
-      "variant": "bullets",
+      "name": "p04-text",
+      "variant": "text-caption",
       "meta": {
         "badge": "第 4 页",
-        "counter": "4/7",
+        "counter": "4/8",
+        "theme": "orange",
+        "cta": "cta4"
+      },
+      "content": {
+        "title": "文字页",
+        "body": "**摘要：** 无图新闻保留完整事实。\n\n**影响：** 单独说明后续判断。"
+      }
+    },
+    {
+      "name": "p05-bullets",
+      "variant": "bullets",
+      "meta": {
+        "badge": "第 5 页",
+        "counter": "5/8",
         "theme": "orange",
         "cta": "cta4"
       },
@@ -64,11 +84,11 @@
       }
     },
     {
-      "name": "p05-compare",
+      "name": "p06-compare",
       "variant": "compare",
       "meta": {
-        "badge": "第 5 页",
-        "counter": "5/7",
+        "badge": "第 6 页",
+        "counter": "6/8",
         "theme": "green",
         "cta": "cta5"
       },
@@ -87,11 +107,11 @@
       }
     },
     {
-      "name": "p06-gallery",
+      "name": "p07-gallery",
       "variant": "gallery-steps",
       "meta": {
-        "badge": "第 6 页",
-        "counter": "6/7",
+        "badge": "第 7 页",
+        "counter": "7/8",
         "theme": "green",
         "cta": "cta6"
       },
@@ -104,11 +124,11 @@
       }
     },
     {
-      "name": "p07-ending",
+      "name": "p08-ending",
       "variant": "ending",
       "meta": {
-        "badge": "第 7 页",
-        "counter": "7/7",
+        "badge": "第 8 页",
+        "counter": "8/8",
         "theme": "green",
         "cta": "cta7"
       },
diff --git a/internal/render/testdata/fixtures/tech-noir-all-variants.json b/internal/render/testdata/fixtures/tech-noir-all-variants.json
index 3fa5936..7e8fe9f 100644
--- a/internal/render/testdata/fixtures/tech-noir-all-variants.json
+++ b/internal/render/testdata/fixtures/tech-noir-all-variants.json
@@ -6,7 +6,7 @@
       "variant": "cover",
       "meta": {
         "badge": "第 1 页",
-        "counter": "1/7",
+        "counter": "1/8",
         "theme": "orange",
         "cta": "cta1"
       },
@@ -20,7 +20,7 @@
       "variant": "quote",
       "meta": {
         "badge": "第 2 页",
-        "counter": "2/7",
+        "counter": "2/8",
         "theme": "orange",
         "cta": "cta2"
       },
@@ -36,21 +36,41 @@
       "variant": "image-caption",
       "meta": {
         "badge": "第 3 页",
-        "counter": "3/7",
+        "counter": "3/8",
         "theme": "orange",
         "cta": "cta3"
       },
       "content": {
         "title": "图文页",
-        "body": "图文说明"
+        "body": "图文说明",
+        "images": [
+          {
+            "src": "https://example.com/fixture-image.png",
+            "alt": "fixture image"
+          }
+        ]
       }
     },
     {
-      "name": "p04-bullets",
-      "variant": "bullets",
+      "name": "p04-text",
+      "variant": "text-caption",
       "meta": {
         "badge": "第 4 页",
-        "counter": "4/7",
+        "counter": "4/8",
+        "theme": "orange",
+        "cta": "cta4"
+      },
+      "content": {
+        "title": "文字页",
+        "body": "**摘要：** 无图新闻保留完整事实。\n\n**影响：** 单独说明后续判断。"
+      }
+    },
+    {
+      "name": "p05-bullets",
+      "variant": "bullets",
+      "meta": {
+        "badge": "第 5 页",
+        "counter": "5/8",
         "theme": "orange",
         "cta": "cta4"
       },
@@ -64,11 +84,11 @@
       }
     },
     {
-      "name": "p05-compare",
+      "name": "p06-compare",
       "variant": "compare",
       "meta": {
-        "badge": "第 5 页",
-        "counter": "5/7",
+        "badge": "第 6 页",
+        "counter": "6/8",
         "theme": "green",
         "cta": "cta5"
       },
@@ -87,11 +107,11 @@
       }
     },
     {
-      "name": "p06-gallery",
+      "name": "p07-gallery",
       "variant": "gallery-steps",
       "meta": {
-        "badge": "第 6 页",
-        "counter": "6/7",
+        "badge": "第 7 页",
+        "counter": "7/8",
         "theme": "green",
         "cta": "cta6"
       },
@@ -104,11 +124,11 @@
       }
     },
     {
-      "name": "p07-ending",
+      "name": "p08-ending",
       "variant": "ending",
       "meta": {
-        "badge": "第 7 页",
-        "counter": "7/7",
+        "badge": "第 8 页",
+        "counter": "8/8",
         "theme": "green",
         "cta": "cta7"
       },
diff --git a/internal/render/testdata/fixtures/tech-noir-semantic-highlight.json b/internal/render/testdata/fixtures/tech-noir-semantic-highlight.json
index 02da8c2..9f582d5 100644
--- a/internal/render/testdata/fixtures/tech-noir-semantic-highlight.json
+++ b/internal/render/testdata/fixtures/tech-noir-semantic-highlight.json
@@ -32,8 +32,8 @@
       }
     },
     {
-      "name": "p03-image",
-      "variant": "image-caption",
+      "name": "p03-text",
+      "variant": "text-caption",
       "meta": {
         "badge": "第 3 页",
         "counter": "3/7",
@@ -41,8 +41,8 @@
         "cta": "看代码块示例"
       },
       "content": {
-        "title": "图文页",
-        "body": "先执行命令：\n```bash\nmark2note --input article.md --theme default\n```"
+        "title": "文字页",
+        "body": "**摘要：** 先执行命令：\n```bash\nmark2note --input article.md --theme default\n```"
       }
     },
     {
diff --git a/internal/render/testdata/fixtures/warm-paper-all-variants.json b/internal/render/testdata/fixtures/warm-paper-all-variants.json
index 4d0278d..4295bdc 100644
--- a/internal/render/testdata/fixtures/warm-paper-all-variants.json
+++ b/internal/render/testdata/fixtures/warm-paper-all-variants.json
@@ -6,7 +6,7 @@
       "variant": "cover",
       "meta": {
         "badge": "第 1 页",
-        "counter": "1/7",
+        "counter": "1/8",
         "theme": "orange",
         "cta": "cta1"
       },
@@ -20,7 +20,7 @@
       "variant": "quote",
       "meta": {
         "badge": "第 2 页",
-        "counter": "2/7",
+        "counter": "2/8",
         "theme": "orange",
         "cta": "cta2"
       },
@@ -36,21 +36,41 @@
       "variant": "image-caption",
       "meta": {
         "badge": "第 3 页",
-        "counter": "3/7",
+        "counter": "3/8",
         "theme": "orange",
         "cta": "cta3"
       },
       "content": {
         "title": "暖纸图文",
-        "body": "暖纸说明"
+        "body": "暖纸说明",
+        "images": [
+          {
+            "src": "https://example.com/fixture-image.png",
+            "alt": "fixture image"
+          }
+        ]
       }
     },
     {
-      "name": "p04-bullets",
-      "variant": "bullets",
+      "name": "p04-text",
+      "variant": "text-caption",
       "meta": {
         "badge": "第 4 页",
-        "counter": "4/7",
+        "counter": "4/8",
+        "theme": "orange",
+        "cta": "cta4"
+      },
+      "content": {
+        "title": "文字页",
+        "body": "**摘要：** 无图新闻保留完整事实。\n\n**影响：** 单独说明后续判断。"
+      }
+    },
+    {
+      "name": "p05-bullets",
+      "variant": "bullets",
+      "meta": {
+        "badge": "第 5 页",
+        "counter": "5/8",
         "theme": "orange",
         "cta": "cta4"
       },
@@ -64,11 +84,11 @@
       }
     },
     {
-      "name": "p05-compare",
+      "name": "p06-compare",
       "variant": "compare",
       "meta": {
-        "badge": "第 5 页",
-        "counter": "5/7",
+        "badge": "第 6 页",
+        "counter": "6/8",
         "theme": "green",
         "cta": "cta5"
       },
@@ -87,11 +107,11 @@
       }
     },
     {
-      "name": "p06-gallery",
+      "name": "p07-gallery",
       "variant": "gallery-steps",
       "meta": {
-        "badge": "第 6 页",
-        "counter": "6/7",
+        "badge": "第 7 页",
+        "counter": "7/8",
         "theme": "green",
         "cta": "cta6"
       },
@@ -104,11 +124,11 @@
       }
     },
     {
-      "name": "p07-ending",
+      "name": "p08-ending",
       "variant": "ending",
       "meta": {
-        "badge": "第 7 页",
-        "counter": "7/7",
+        "badge": "第 8 页",
+        "counter": "8/8",
         "theme": "green",
         "cta": "cta7"
       },
diff --git a/internal/render/testdata/fixtures/warm-paper-semantic-highlight.json b/internal/render/testdata/fixtures/warm-paper-semantic-highlight.json
index 081ff78..820d9ae 100644
--- a/internal/render/testdata/fixtures/warm-paper-semantic-highlight.json
+++ b/internal/render/testdata/fixtures/warm-paper-semantic-highlight.json
@@ -32,8 +32,8 @@
       }
     },
     {
-      "name": "p03-image",
-      "variant": "image-caption",
+      "name": "p03-text",
+      "variant": "text-caption",
       "meta": {
         "badge": "第 3 页",
         "counter": "3/7",
@@ -41,8 +41,8 @@
         "cta": "看代码块示例"
       },
       "content": {
-        "title": "图文页",
-        "body": "先执行命令：\n```bash\nmark2note --input article.md --theme default\n```"
+        "title": "文字页",
+        "body": "**摘要：** 先执行命令：\n```bash\nmark2note --input article.md --theme default\n```"
       }
     },
     {
diff --git a/internal/render/testdata/golden-html/default-all-variants.sha256 b/internal/render/testdata/golden-html/default-all-variants.sha256
index 84e6d4c..5a3fb7d 100644
--- a/internal/render/testdata/golden-html/default-all-variants.sha256
+++ b/internal/render/testdata/golden-html/default-all-variants.sha256
@@ -1 +1 @@
-82bb2741d905c048a50fc40ca04f8aadc93f41e76a92d1db75f46c66ad13f55b
+c5ea798f77644a72caa42e69cd5558ff1149426589352c1fce38789b7f6c8b94
diff --git a/internal/render/testdata/golden-html/default-author-global.sha256 b/internal/render/testdata/golden-html/default-author-global.sha256
index cbb1a3e..d5825f3 100644
--- a/internal/render/testdata/golden-html/default-author-global.sha256
+++ b/internal/render/testdata/golden-html/default-author-global.sha256
@@ -1 +1 @@
-21bb623338106314d2654c59e99a5db8dc6041e71bcb84622f2ef1c09d0d6424
+316f003e8405eda5fcf5f2133f8da15eb53c14f3e88cdc2eac4fccb7c0ef634e
diff --git a/internal/render/testdata/golden-html/default-author-long.sha256 b/internal/render/testdata/golden-html/default-author-long.sha256
index c05ba1c..74e35fd 100644
--- a/internal/render/testdata/golden-html/default-author-long.sha256
+++ b/internal/render/testdata/golden-html/default-author-long.sha256
@@ -1 +1 @@
-0f61984f96c85e19d8d44003e0c9961935dbf1893ed7228ae2223fed3543b893
+edd81e2cf0127bc2eb1f39beca2463b987202a94c2ea8b3ba387085f23eb963a
diff --git a/internal/render/testdata/golden-html/default-author-none.sha256 b/internal/render/testdata/golden-html/default-author-none.sha256
index e53ca90..5491ec2 100644
--- a/internal/render/testdata/golden-html/default-author-none.sha256
+++ b/internal/render/testdata/golden-html/default-author-none.sha256
@@ -1 +1 @@
-bfd86ee4478c804b1175475514b35087cbb3f034d6fc12bb6110b463dd01b84e
+753d733db5cef28dbdba83ba5e437928e9e911d4c106f4032b196275efbdb5eb
diff --git a/internal/render/testdata/golden-html/default-author-override.sha256 b/internal/render/testdata/golden-html/default-author-override.sha256
index 7293e28..68664d3 100644
--- a/internal/render/testdata/golden-html/default-author-override.sha256
+++ b/internal/render/testdata/golden-html/default-author-override.sha256
@@ -1 +1 @@
-0f4aa7ec66d60d7b5e061c25041a72e13b290f0442645690c241ad6863dbf1ef
+1b77711d72bf58f1fd8213238bf30a5d93120ede4815b55084baf850dd9339e2
diff --git a/internal/render/testdata/golden-html/default-semantic-highlight.sha256 b/internal/render/testdata/golden-html/default-semantic-highlight.sha256
index 2bdac59..26d502d 100644
--- a/internal/render/testdata/golden-html/default-semantic-highlight.sha256
+++ b/internal/render/testdata/golden-html/default-semantic-highlight.sha256
@@ -1 +1 @@
-cfd41e5484b51a53998fc5bf81af1ee61365170a6084a62852601416cb852cf3
+fe060a708529ab00edb8b9ac71221ed3bc0597e238f3476dc5c4b7433271f24c
diff --git a/internal/render/testdata/golden-html/editorial-cool-all-variants.sha256 b/internal/render/testdata/golden-html/editorial-cool-all-variants.sha256
index 2dcc23f..1dbb052 100644
--- a/internal/render/testdata/golden-html/editorial-cool-all-variants.sha256
+++ b/internal/render/testdata/golden-html/editorial-cool-all-variants.sha256
@@ -1 +1 @@
-03d34e2ebb7bfd5f10d7bb7360b45e4a0f30020a96f9aa0374c7424b1a24510d
+c37ddfd45ae1e720cae68c10ea11163e3ff0d60ba1941390cbc8740c325b0e87
diff --git a/internal/render/testdata/golden-html/editorial-cool-semantic-highlight.sha256 b/internal/render/testdata/golden-html/editorial-cool-semantic-highlight.sha256
index 109a2b3..7b86e6f 100644
--- a/internal/render/testdata/golden-html/editorial-cool-semantic-highlight.sha256
+++ b/internal/render/testdata/golden-html/editorial-cool-semantic-highlight.sha256
@@ -1 +1 @@
-82dff5cc88163b96b386c79109ca03b7e664700bd9ef23e2dd7131aace66fd66
+94f3b90506fa3cf9ce401a21e20bae097c317167a128b6236df0b596f05b172e
diff --git a/internal/render/testdata/golden-html/fresh-green-all-variants.sha256 b/internal/render/testdata/golden-html/fresh-green-all-variants.sha256
index 9084554..20bae10 100644
--- a/internal/render/testdata/golden-html/fresh-green-all-variants.sha256
+++ b/internal/render/testdata/golden-html/fresh-green-all-variants.sha256
@@ -1 +1 @@
-68b5ca646fa40fc5d89e8d8691c3fa539413a5aea62b8c6b3684120ebc281411
+c3156457cc8e63e65f2433191971669d03984a76da58b3214f42fcdd3420eb65
diff --git a/internal/render/testdata/golden-html/plum-ink-all-variants.sha256 b/internal/render/testdata/golden-html/plum-ink-all-variants.sha256
index c67d53e..47958f7 100644
--- a/internal/render/testdata/golden-html/plum-ink-all-variants.sha256
+++ b/internal/render/testdata/golden-html/plum-ink-all-variants.sha256
@@ -1 +1 @@
-68b82e32ed55b7f5cc9dbc1a1bc4a93fe597ac079e3ecfedeba1b5129c5b83c5
+83811775bf57d2200c82ce841ed340a7779533bb70f15d8e2527961ed621f8d2
diff --git a/internal/render/testdata/golden-html/sage-mist-all-variants.sha256 b/internal/render/testdata/golden-html/sage-mist-all-variants.sha256
index e58a65a..7edbbac 100644
--- a/internal/render/testdata/golden-html/sage-mist-all-variants.sha256
+++ b/internal/render/testdata/golden-html/sage-mist-all-variants.sha256
@@ -1 +1 @@
-6e5930b271b0e2f29f83853bef1a595460476374a4d25303ffe54c089ce7f70e
+8a8aefa9209f54ad763fd564569b72dc21970c64bd6cbb1568624243bf1f63ac
diff --git a/internal/render/testdata/golden-html/tech-noir-all-variants.sha256 b/internal/render/testdata/golden-html/tech-noir-all-variants.sha256
index 0b20a0c..8f96596 100644
--- a/internal/render/testdata/golden-html/tech-noir-all-variants.sha256
+++ b/internal/render/testdata/golden-html/tech-noir-all-variants.sha256
@@ -1 +1 @@
-d37f8ce2965031cd5f19d108d89998c668f37b00c967e4610b901266f55af52c
+2d67134689a3a9b546b4e54260b08f9ac17fe3de8a56d227196d2002f674186b
diff --git a/internal/render/testdata/golden-html/tech-noir-semantic-highlight.sha256 b/internal/render/testdata/golden-html/tech-noir-semantic-highlight.sha256
index 708286c..f0eba94 100644
--- a/internal/render/testdata/golden-html/tech-noir-semantic-highlight.sha256
+++ b/internal/render/testdata/golden-html/tech-noir-semantic-highlight.sha256
@@ -1 +1 @@
-e64fd158b998a7bce787a9efd83009c71d8dfdb21a46a3f6accd53d0695ed6fa
+b5044f495a7221d1bd5fcb917b706c3ae5273d9391355b9fa92e967b5619627f
diff --git a/internal/render/testdata/golden-html/warm-paper-all-variants.sha256 b/internal/render/testdata/golden-html/warm-paper-all-variants.sha256
index d14f8b2..8a28109 100644
--- a/internal/render/testdata/golden-html/warm-paper-all-variants.sha256
+++ b/internal/render/testdata/golden-html/warm-paper-all-variants.sha256
@@ -1 +1 @@
-9e5dec1adb82478257d86ed30185071d3868baf05bd2dc542e3a8b89d1825e43
+84f3179fef18c76e1c39bae4bfce9d50a34184646ce39905906430ff9fc90751
diff --git a/internal/render/testdata/golden-html/warm-paper-semantic-highlight.sha256 b/internal/render/testdata/golden-html/warm-paper-semantic-highlight.sha256
index f142206..d0a6112 100644
--- a/internal/render/testdata/golden-html/warm-paper-semantic-highlight.sha256
+++ b/internal/render/testdata/golden-html/warm-paper-semantic-highlight.sha256
@@ -1 +1 @@
-bc8dc5dc12e8383c2871d2f2a110ab0e3ba5ed32bc644cb2b4346a989ee195b9
+9512653affffb94758adb1d7b117578e194c8b55b5d83d7901ae1dba460dce40
diff --git a/internal/xhs/publisher.go b/internal/xhs/publisher.go
index 0de46d8..896170e 100644
--- a/internal/xhs/publisher.go
+++ b/internal/xhs/publisher.go
@@ -34,7 +34,8 @@ type PublishPage interface {
 
 type scheduledPreSubmitPage interface {
 	dismissEditorOverlays() error
-	applyOriginalDeclaration(bool) error
+	applyCollection(string) error
+	applyOriginalDeclaration(bool, string) error
 	applyContentCopyPreference(bool) error
 }
 
@@ -108,8 +109,14 @@ var (
 		`.d-datepicker input.d-text`,
 		`input[placeholder*="选择发布时间"]`,
 	}
+	collectionTriggerSelector  = ".collection-plugin-wrapper .collection-plugin-button, .collection-plugin-button, button, div"
+	collectionPopoverSelector  = ".collection-plugin-popover, .d-popover"
+	collectionOptionSelector   = ".item-label, .item"
+	collectionSelectedSelector = ".collection-plugin-wrapper, .collection-plugin-button"
 )
 
+const collectionPopoverTimeout = 2 * time.Second
+
 func (p *rodPage) Open(ctx context.Context) error {
 	if err := ctx.Err(); err != nil {
 		return err
@@ -333,6 +340,14 @@ func existingHashtagTokens(text string) map[string]bool {
 	return result
 }
 
+func shouldSetOnlySelfVisibility(request PublishRequest) bool {
+	visibility, err := ValidateVisibility(string(request.Visibility))
+	if err != nil {
+		return true
+	}
+	return visibility == PublishVisibilityOnlySelf
+}
+
 func (p *rodPage) PublishOnlySelf(ctx context.Context, request PublishRequest) error {
 	if err := ctx.Err(); err != nil {
 		return err
@@ -341,17 +356,23 @@ func (p *rodPage) PublishOnlySelf(ctx context.Context, request PublishRequest) e
 	if err := p.dismissEditorOverlays(); err != nil {
 		return err
 	}
+	defaultXHSLogger("only-self publish apply collection")
+	if err := p.applyCollection(request.Collection); err != nil {
+		return err
+	}
 	defaultXHSLogger("only-self publish declare original")
-	if err := p.applyOriginalDeclaration(request.DeclareOriginal); err != nil {
+	if err := p.applyOriginalDeclaration(request.DeclareOriginal, request.OriginalDeclarationType); err != nil {
 		return err
 	}
 	defaultXHSLogger("only-self publish set content copy")
 	if err := p.applyContentCopyPreference(request.AllowContentCopy); err != nil {
 		return err
 	}
-	defaultXHSLogger("only-self publish set visibility")
-	if err := p.setOnlySelfVisible(); err != nil {
-		return err
+	if shouldSetOnlySelfVisibility(request) {
+		defaultXHSLogger("only-self publish set visibility")
+		if err := p.setOnlySelfVisible(); err != nil {
+			return err
+		}
 	}
 	defaultXHSLogger("only-self publish click submit")
 	clicked, err := p.clickByText("button", "^发布$")
@@ -421,12 +442,18 @@ func prepareOnlySelfBeforeSubmit(page PublishPage, request PublishRequest) error
 	if err := preSubmitPage.dismissEditorOverlays(); err != nil {
 		return err
 	}
-	if err := preSubmitPage.applyOriginalDeclaration(request.DeclareOriginal); err != nil {
+	if err := preSubmitPage.applyCollection(request.Collection); err != nil {
+		return err
+	}
+	if err := preSubmitPage.applyOriginalDeclaration(request.DeclareOriginal, request.OriginalDeclarationType); err != nil {
 		return err
 	}
 	if err := preSubmitPage.applyContentCopyPreference(request.AllowContentCopy); err != nil {
 		return err
 	}
+	if !shouldSetOnlySelfVisibility(request) {
+		return nil
+	}
 	return preSubmitPage.setOnlySelfVisible()
 }
 
@@ -438,7 +465,10 @@ func runScheduledPreSubmitHooks(page PublishPage, request PublishRequest) error
 	if err := preSubmitPage.dismissEditorOverlays(); err != nil {
 		return err
 	}
-	if err := preSubmitPage.applyOriginalDeclaration(request.DeclareOriginal); err != nil {
+	if err := preSubmitPage.applyCollection(request.Collection); err != nil {
+		return err
+	}
+	if err := preSubmitPage.applyOriginalDeclaration(request.DeclareOriginal, request.OriginalDeclarationType); err != nil {
 		return err
 	}
 	if err := preSubmitPage.applyContentCopyPreference(request.AllowContentCopy); err != nil {
@@ -692,6 +722,129 @@ func (p *rodPage) clickVisibleNodeByText(selector string, pattern string) (bool,
 	return clicked, nil
 }
 
+func (p *rodPage) applyCollection(collection string) error {
+	collection = strings.TrimSpace(collection)
+	if collection == "" || p.isCollectionSelected(collection) {
+		return nil
+	}
+	if err := p.openCollectionPopover(); err != nil {
+		return err
+	}
+	if err := p.selectCollectionOption(collection); err != nil {
+		return err
+	}
+	if !p.isCollectionSelected(collection) {
+		return fmt.Errorf("collection %q was not selected", collection)
+	}
+	return nil
+}
+
+func (p *rodPage) openCollectionPopover() error {
+	if p.isCollectionPopoverVisible() {
+		return nil
+	}
+	clicked, err := p.clickVisibleNodeByText(collectionTriggerSelector, "^选择合集$")
+	if err != nil {
+		return err
+	}
+	if !clicked {
+		return fmt.Errorf("collection selector not found")
+	}
+	deadline := time.Now().Add(collectionPopoverTimeout)
+	for time.Now().Before(deadline) {
+		if p.isCollectionPopoverVisible() {
+			return nil
+		}
+		time.Sleep(100 * time.Millisecond)
+	}
+	return fmt.Errorf("collection popover did not become visible")
+}
+
+func (p *rodPage) isCollectionPopoverVisible() bool {
+	visible := false
+	_ = rodTry(func() {
+		visible = p.page.MustEval(`(popoverSelector, optionSelector) => {
+			const normalize = (value) => (value || '').replace(/\s+/g, ' ').trim();
+			const isVisible = (node) => {
+				if (!node) return false;
+				const rect = node.getBoundingClientRect();
+				const style = window.getComputedStyle(node);
+				return rect.width > 0 && rect.height > 0 && style.display !== 'none' && style.visibility !== 'hidden';
+			};
+			return Array.from(document.querySelectorAll(popoverSelector)).some((node) => {
+				if (!isVisible(node)) return false;
+				const text = normalize(node.innerText || node.textContent || '');
+				return text.includes('创建合集') || Array.from(node.querySelectorAll(optionSelector)).some((item) => normalize(item.innerText || item.textContent || '') !== '');
+			});
+		}`, collectionPopoverSelector, collectionOptionSelector).Bool()
+	})
+	return visible
+}
+
+func (p *rodPage) selectCollectionOption(collection string) error {
+	selected := false
+	err := rodTry(func() {
+		selected = p.page.MustEval(`(collection, popoverSelector, optionSelector) => {
+			const normalize = (value) => (value || '').replace(/\s+/g, ' ').trim();
+			const isVisible = (node) => {
+				if (!node) return false;
+				const rect = node.getBoundingClientRect();
+				const style = window.getComputedStyle(node);
+				return rect.width > 0 && rect.height > 0 && style.display !== 'none' && style.visibility !== 'hidden';
+			};
+			const fire = (node, type) => node.dispatchEvent(new MouseEvent(type, { bubbles: true, cancelable: true, view: window, button: 0 }));
+			const popovers = Array.from(document.querySelectorAll(popoverSelector)).filter(isVisible);
+			for (const popover of popovers) {
+				const labels = Array.from(popover.querySelectorAll(optionSelector));
+				for (const label of labels) {
+					if (!isVisible(label)) continue;
+					if (normalize(label.innerText || label.textContent || '') !== collection) continue;
+					const item = label.closest('.item') || label;
+					if (!isVisible(item)) continue;
+					item.scrollIntoView({ block: 'center', behavior: 'instant' });
+					fire(item, 'mousedown');
+					fire(item, 'mouseup');
+					if (isVisible(popover)) item.click();
+					return true;
+				}
+			}
+			return false;
+		}`, collection, collectionPopoverSelector, collectionOptionSelector).Bool()
+		if selected {
+			p.page.MustWaitStable()
+		}
+	})
+	if err != nil {
+		return err
+	}
+	if !selected {
+		return fmt.Errorf("collection option %q not found", collection)
+	}
+	return nil
+}
+
+func (p *rodPage) isCollectionSelected(collection string) bool {
+	selected := false
+	_ = rodTry(func() {
+		selected = p.page.MustEval(`(collection, selectedSelector) => {
+			const normalize = (value) => (value || '').replace(/\s+/g, ' ').trim();
+			const isVisible = (node) => {
+				if (!node) return false;
+				const rect = node.getBoundingClientRect();
+				const style = window.getComputedStyle(node);
+				return rect.width > 0 && rect.height > 0 && style.display !== 'none' && style.visibility !== 'hidden';
+			};
+			return Array.from(document.querySelectorAll(selectedSelector)).some((node) => {
+				if (!isVisible(node)) return false;
+				const selected = normalize(node.getAttribute('data-selected') || '');
+				const text = normalize(node.innerText || node.textContent || '');
+				return selected === collection || text === collection || text.includes(collection);
+			});
+		}`, collection, collectionSelectedSelector).Bool()
+	})
+	return selected
+}
+
 func (p *rodPage) openPermissionDropdown() error {
 	if p.isOnlySelfPermissionSelected() {
 		return nil
@@ -1208,44 +1361,334 @@ func isOriginalDeclarationNeedle(labelNeedle string) bool {
 	return strings.Contains(labelNeedle, "原创") || strings.Contains(labelNeedle, "声明")
 }
 
-func (p *rodPage) applyOriginalDeclaration(enabled bool) error {
+func (p *rodPage) applyOriginalDeclaration(enabled bool, declarationType string) error {
 	if !enabled {
 		return nil
 	}
-	if p.isOriginalDeclared() {
-		return nil
-	}
-	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 {
-				p.debugOriginalDeclarationState()
-				return clickErr
+	if !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 {
+					p.debugOriginalDeclarationState()
+					return clickErr
+				}
 			}
 		}
-	}
-	if err := p.setCheckboxState("我已阅读并同意", true); err != nil {
-		if !strings.Contains(err.Error(), `checkbox containing "我已阅读并同意" not found`) {
+		if err := p.setCheckboxState("我已阅读并同意", true); err != nil {
+			if !strings.Contains(err.Error(), `checkbox containing "我已阅读并同意" not found`) {
+				return err
+			}
+		}
+		if clicked, err := p.clickByText("button", "声明原创"); err != nil {
 			return err
+		} else if clicked {
+			deadline := time.Now().Add(p.effectiveTimeouts().originalConfirm)
+			for time.Now().Before(deadline) {
+				if p.isOriginalDeclared() {
+					break
+				}
+				time.Sleep(100 * time.Millisecond)
+			}
+		}
+		if !p.isOriginalDeclared() {
+			p.debugOriginalDeclarationState()
+			return fmt.Errorf("original declaration was requested but not selected")
 		}
 	}
-	if clicked, err := p.clickByText("button", "声明原创"); err != nil {
+	return p.applyOriginalDeclarationType(declarationType)
+}
+
+func (p *rodPage) applyOriginalDeclarationType(value string) error {
+	label, err := originalDeclarationTypeLabel(value)
+	if err != nil {
 		return err
-	} else if clicked {
-		deadline := time.Now().Add(p.effectiveTimeouts().originalConfirm)
+	}
+	if label == "" || p.isOriginalDeclarationTypeSelected(label) {
+		return nil
+	}
+	if err := p.openOriginalDeclarationTypeDropdown(); err != nil {
+		p.debugOriginalDeclarationState()
+		return err
+	}
+	if err := p.selectOriginalDeclarationType(label); err != nil {
+		p.debugOriginalDeclarationState()
+		return err
+	}
+	if !p.isOriginalDeclarationTypeSelected(label) {
+		p.debugOriginalDeclarationState()
+		return fmt.Errorf("original declaration type %q was not selected", label)
+	}
+	return nil
+}
+
+func originalDeclarationTypeLabel(value string) (string, error) {
+	declarationType, err := ValidateOriginalDeclarationType(value)
+	if err != nil {
+		return "", err
+	}
+	switch declarationType {
+	case "":
+		return "", nil
+	case OriginalDeclarationTypeAIGenerated:
+		return "笔记含AI生成内容", nil
+	default:
+		return "", fmt.Errorf("unsupported original declaration type %q", value)
+	}
+}
+
+func originalDeclarationTypePattern(label string) string {
+	if strings.Contains(label, "AI") {
+		return "笔记含\\s*AI\\s*(生成|合成)内容|AI\\s*(生成|合成)"
+	}
+	return regexpQuote(label)
+}
+
+func regexpQuote(value string) string {
+	var out strings.Builder
+	for _, r := range value {
+		if strings.ContainsRune(`\\.+*?^$()[]{}|`, r) {
+			out.WriteRune('\\')
+		}
+		out.WriteRune(r)
+	}
+	return out.String()
+}
+
+func (p *rodPage) openOriginalDeclarationTypeDropdown() error {
+	if p.isOriginalDeclarationTypeDropdownVisible() {
+		return nil
+	}
+	triggers, err := p.findOriginalDeclarationTypeTriggers()
+	if err != nil {
+		return err
+	}
+	for _, trigger := range triggers {
+		if err := p.clickOriginalDeclarationTypeTrigger(trigger); err != nil {
+			return err
+		}
+		deadline := time.Now().Add(500 * time.Millisecond)
 		for time.Now().Before(deadline) {
-			if p.isOriginalDeclared() {
+			if p.isOriginalDeclarationTypeDropdownVisible() {
 				return nil
 			}
-			time.Sleep(100 * time.Millisecond)
+			time.Sleep(50 * time.Millisecond)
 		}
 	}
-	if !p.isOriginalDeclared() {
-		p.debugOriginalDeclarationState()
-		return fmt.Errorf("original declaration was requested but not selected")
+	return fmt.Errorf("original declaration type dropdown did not become visible")
+}
+
+func (p *rodPage) clickOriginalDeclarationTypeTrigger(trigger *rod.Element) error {
+	if err := rodTry(func() {
+		trigger.MustScrollIntoView().MustWaitVisible().MustClick()
+		p.page.MustWaitStable()
+	}); err != nil {
+		return err
+	}
+	if p.isOriginalDeclarationTypeDropdownVisible() {
+		return nil
+	}
+	return p.openOriginalDeclarationTypeDropdownFallback(trigger)
+}
+
+func (p *rodPage) findOriginalDeclarationTypeTriggers() ([]*rod.Element, error) {
+	const attr = "data-mark2note-original-declaration-type-trigger"
+	count := 0
+	err := rodTry(func() {
+		count = p.page.MustEval(`(attr) => {
+			const normalize = (value) => (value || '').replace(/\s+/g, ' ').trim();
+			const isVisible = (node) => {
+				if (!node) return false;
+				const rect = node.getBoundingClientRect();
+				const style = window.getComputedStyle(node);
+				return rect.width > 0 && rect.height > 0 && style.display !== 'none' && style.visibility !== 'hidden';
+			};
+			document.querySelectorAll('[' + attr + ']').forEach((node) => node.removeAttribute(attr));
+			const selectors = [
+				'.original-wrapper .d-select-main',
+				'.original-wrapper .d-select',
+				'.original-wrapper .d-select-wrapper',
+				'.wrapper .d-select-main',
+				'.wrapper .d-select',
+				'.wrapper .d-select-wrapper',
+				'.custom-select-44 .d-select-main',
+				'.custom-select-44 .d-select',
+				'.custom-select-44',
+				'.original-wrapper .d-select-placeholder',
+				'.wrapper .d-select-placeholder',
+			];
+			const seen = new Set();
+			let index = 0;
+			for (const selector of selectors) {
+				for (const node of Array.from(document.querySelectorAll(selector))) {
+					if (seen.has(node) || !isVisible(node)) continue;
+					const container = node.closest('.original-wrapper, .wrapper, .custom-select-44') || node;
+					const text = normalize((container.innerText || container.textContent || '') + ' ' + (node.innerText || node.textContent || ''));
+					if (!/添加内容类型声明|内容类型声明|AI\s*生成/.test(text)) continue;
+					seen.add(node);
+					node.setAttribute(attr, String(index));
+					index++;
+				}
+			}
+			return index;
+		}`, attr).Int()
+	})
+	if err != nil {
+		return nil, err
+	}
+	if count == 0 {
+		return nil, fmt.Errorf("original declaration type selector not found")
+	}
+	triggers := make([]*rod.Element, 0, count)
+	for i := 0; i < count; i++ {
+		var trigger *rod.Element
+		if err := rodTry(func() {
+			trigger = p.page.MustElement(fmt.Sprintf("[%s=\"%d\"]", attr, i))
+		}); err != nil {
+			return nil, err
+		}
+		triggers = append(triggers, trigger)
+	}
+	return triggers, nil
+}
+
+func (p *rodPage) openOriginalDeclarationTypeDropdownFallback(trigger *rod.Element) error {
+	return rodTry(func() {
+		trigger.MustEval(`() => {
+			const firePointer = (node, type) => {
+				if (typeof PointerEvent === 'function') {
+					node.dispatchEvent(new PointerEvent(type, { bubbles: true, cancelable: true, view: window, button: 0, pointerType: 'mouse', isPrimary: true }));
+				}
+			};
+			const fireMouse = (node, type) => node.dispatchEvent(new MouseEvent(type, { bubbles: true, cancelable: true, view: window, button: 0 }));
+			const node = this;
+			node.scrollIntoView({ block: 'center', behavior: 'instant' });
+			firePointer(node, 'pointerdown');
+			fireMouse(node, 'mousedown');
+			firePointer(node, 'pointerup');
+			fireMouse(node, 'mouseup');
+			fireMouse(node, 'click');
+			if (typeof node.focus === 'function') node.focus();
+		}`)
+		p.page.MustWaitStable()
+	})
+}
+
+func (p *rodPage) isOriginalDeclarationTypeDropdownVisible() bool {
+	visible := false
+	_ = rodTry(func() {
+		visible = p.page.MustEval(`() => {
+			const normalize = (value) => (value || '').replace(/\s+/g, ' ').trim();
+			const isVisible = (node) => {
+				if (!node) return false;
+				const rect = node.getBoundingClientRect();
+				const style = window.getComputedStyle(node);
+				return rect.width > 0 && rect.height > 0 && style.display !== 'none' && style.visibility !== 'hidden';
+			};
+			const hasAIOption = (text) => /笔记含\s*AI\s*(生成|合成)内容|AI\s*(生成|合成)/.test(text);
+			const hasOtherDeclarationOption = (text) => /无声明|虚构演绎|内容包含营销广告|内容来源声明/.test(text);
+			const overlaySelector = '.d-popover.d-dropdown, .d-dropdown, .d-popover, [role="listbox"], [data-popper-placement], .d-select-dropdown';
+			const optionSelector = '.d-grid-item, .custom-option, [role="option"], .d-select-option, .d-text, div, span';
+			const overlays = Array.from(document.querySelectorAll(overlaySelector));
+			for (const overlay of overlays) {
+				const overlayText = normalize(overlay.innerText || overlay.textContent || '');
+				if (isVisible(overlay) && (hasAIOption(overlayText) || hasOtherDeclarationOption(overlayText))) {
+					return true;
+				}
+				const visibleOptionTexts = Array.from(overlay.querySelectorAll(optionSelector)).filter(isVisible).map((node) => normalize(node.innerText || node.textContent || ''));
+				if (visibleOptionTexts.some(hasAIOption) && visibleOptionTexts.some(hasOtherDeclarationOption)) {
+					return true;
+				}
+			}
+			const visibleTexts = Array.from(document.querySelectorAll('div, span, label, button')).filter(isVisible).map((node) => normalize(node.innerText || node.textContent || ''));
+			return visibleTexts.some(hasAIOption) && visibleTexts.some(hasOtherDeclarationOption);
+		}`).Bool()
+	})
+	return visible
+}
+
+func (p *rodPage) selectOriginalDeclarationType(label string) error {
+	const attr = "data-mark2note-original-declaration-type-option"
+	pattern := originalDeclarationTypePattern(label)
+	found := false
+	err := rodTry(func() {
+		found = p.page.MustEval(`(attr, pattern) => {
+			const regex = new RegExp(pattern);
+			const normalize = (value) => (value || '').replace(/\s+/g, ' ').trim();
+			const isVisible = (node) => {
+				if (!node) return false;
+				const rect = node.getBoundingClientRect();
+				const style = window.getComputedStyle(node);
+				return rect.width > 0 && rect.height > 0 && style.display !== 'none' && style.visibility !== 'hidden';
+			};
+			document.querySelectorAll('[' + attr + ']').forEach((node) => node.removeAttribute(attr));
+			const overlaySelector = '.d-popover.d-dropdown, .d-dropdown, .d-popover, [role="listbox"], [data-popper-placement], .d-select-dropdown';
+			const optionSelector = '.d-grid-item, .custom-option, [role="option"], .d-select-option, .d-text, div, span';
+			const candidates = [];
+			const seen = new Set();
+			const addCandidate = (node) => {
+				if (!node || seen.has(node)) return;
+				seen.add(node);
+				candidates.push(node);
+			};
+			for (const overlay of Array.from(document.querySelectorAll(overlaySelector))) {
+				Array.from(overlay.querySelectorAll(optionSelector)).forEach(addCandidate);
+			}
+			Array.from(document.querySelectorAll('.d-grid-item, .custom-option, [role="option"], .d-select-option, .d-text')).forEach(addCandidate);
+			for (const option of candidates) {
+				if (!isVisible(option)) continue;
+				const text = normalize(option.innerText || option.textContent || '');
+				if (!regex.test(text)) continue;
+				let target = option;
+				const inner = Array.from(option.querySelectorAll('.d-option, .custom-option, [role="option"], .d-select-option, .d-text, span')).find((node) => {
+					return isVisible(node) && regex.test(normalize(node.innerText || node.textContent || ''));
+				});
+				if (inner) target = inner;
+				if (!isVisible(target)) continue;
+				target.setAttribute(attr, 'true');
+				return true;
+			}
+			return false;
+		}`, attr, pattern).Bool()
+	})
+	if err != nil {
+		return err
+	}
+	if !found {
+		return fmt.Errorf("original declaration type option %q not found", label)
+	}
+	if err := rodTry(func() {
+		p.page.MustElement("[" + attr + `="true"]`).MustScrollIntoView().MustWaitVisible().MustClick()
+		p.page.MustWaitStable()
+	}); err != nil {
+		return err
 	}
 	return nil
 }
 
+func (p *rodPage) isOriginalDeclarationTypeSelected(label string) bool {
+	pattern := originalDeclarationTypePattern(label)
+	selected := false
+	_ = rodTry(func() {
+		selected = p.page.MustEval(`(pattern) => {
+			const regex = new RegExp(pattern);
+			const normalize = (value) => (value || '').replace(/\s+/g, ' ').trim();
+			const isVisible = (node) => {
+				if (!node) return false;
+				const rect = node.getBoundingClientRect();
+				const style = window.getComputedStyle(node);
+				return rect.width > 0 && rect.height > 0 && style.display !== 'none' && style.visibility !== 'hidden';
+			};
+			const selectors = '.original-wrapper .d-select-wrapper, .original-wrapper .d-select-main, .original-wrapper .d-text, .wrapper .d-select-wrapper, .wrapper .d-select-main, .custom-select-44, [data-selected]';
+			return Array.from(document.querySelectorAll(selectors)).some((node) => {
+				if (!isVisible(node)) return false;
+				const text = normalize((node.getAttribute('data-selected') || '') + ' ' + (node.innerText || node.textContent || ''));
+				return regex.test(text);
+			});
+		}`, pattern).Bool()
+	})
+	return selected
+}
+
 func (p *rodPage) isOriginalDeclared() bool {
 	declared := false
 	_ = rodTry(func() {
@@ -1394,6 +1837,23 @@ func (p *rodPage) debugOriginalDeclarationState() {
 		}).filter((item) => /原创|声明|同意|阅读/.test(item.text) || item.tag === 'INPUT'))`).String()
 		defaultXHSLogger("original declaration candidates=%s", nodes)
 	})
+	_ = rodTry(func() {
+		nodes := p.page.MustEval(`() => JSON.stringify(Array.from(document.querySelectorAll('.original-wrapper, .custom-select-44, .d-popover.d-dropdown, .d-dropdown, .d-grid-item, .custom-option, [role="option"], .d-select-option, .d-text')).map((el) => {
+			const text = (el.innerText || el.textContent || el.getAttribute('aria-label') || '').replace(/\s+/g, ' ').trim();
+			const rect = el.getBoundingClientRect();
+			const style = window.getComputedStyle(el);
+			return {
+				tag: el.tagName,
+				text,
+				className: el.className || '',
+				role: el.getAttribute('role') || '',
+				visible: rect.width > 0 && rect.height > 0 && style.display !== 'none' && style.visibility !== 'hidden',
+				rect: { width: Math.round(rect.width), height: Math.round(rect.height), x: Math.round(rect.x), y: Math.round(rect.y) },
+				outerHTML: (el.outerHTML || '').replace(/\s+/g, ' ').trim().slice(0, 260),
+			};
+		}).filter((item) => /原创|声明|AI|合成|生成|营销|虚构|来源/.test(item.text)).slice(0, 80))`).String()
+		defaultXHSLogger("original declaration type nodes=%s", nodes)
+	})
 }
 
 func (p *rodPage) debugPermissionState() {
diff --git a/internal/xhs/publisher_test.go b/internal/xhs/publisher_test.go
index 9ae20dd..8105e59 100644
--- a/internal/xhs/publisher_test.go
+++ b/internal/xhs/publisher_test.go
@@ -78,29 +78,32 @@ func testPage(t *testing.T) *rod.Page {
 }
 
 type fakePublishPage struct {
-	calls               []string
-	uploaded            []string
-	title               string
-	content             string
-	scheduledAt         time.Time
-	openErr             error
-	uploadErr           error
-	titleErr            error
-	contentErr          error
-	publishOnlySelfErr  error
-	confirmOnlySelfErr  error
-	setScheduleErr      error
-	submitScheduleErr   error
-	confirmScheduleErr  error
-	dismissOverlaysErr  error
-	applyOriginalErr    error
-	applyContentCopyErr error
-	originalApplied     bool
-	contentCopyAllowed  bool
-	onlySelfVisible     bool
-	setOnlySelfErr      error
-	orderCounter        *int
-	firstActionOrder    int
+	calls                   []string
+	uploaded                []string
+	title                   string
+	content                 string
+	scheduledAt             time.Time
+	openErr                 error
+	uploadErr               error
+	titleErr                error
+	contentErr              error
+	publishOnlySelfErr      error
+	confirmOnlySelfErr      error
+	setScheduleErr          error
+	submitScheduleErr       error
+	confirmScheduleErr      error
+	dismissOverlaysErr      error
+	applyOriginalErr        error
+	applyContentCopyErr     error
+	applyCollectionErr      error
+	collection              string
+	originalApplied         bool
+	originalDeclarationType string
+	contentCopyAllowed      bool
+	onlySelfVisible         bool
+	setOnlySelfErr          error
+	orderCounter            *int
+	firstActionOrder        int
 }
 
 func (f *fakePublishPage) Open(context.Context) error {
@@ -170,10 +173,22 @@ func (f *fakePublishPage) dismissEditorOverlays() error {
 	return f.dismissOverlaysErr
 }
 
-func (f *fakePublishPage) applyOriginalDeclaration(enabled bool) error {
+func (f *fakePublishPage) applyCollection(collection string) error {
+	collection = strings.TrimSpace(collection)
+	if collection == "" {
+		return nil
+	}
+	f.calls = append(f.calls, "collection")
+	f.recordActionOrder()
+	f.collection = collection
+	return f.applyCollectionErr
+}
+
+func (f *fakePublishPage) applyOriginalDeclaration(enabled bool, declarationType string) error {
 	f.calls = append(f.calls, "declare-original")
 	f.recordActionOrder()
 	f.originalApplied = enabled
+	f.originalDeclarationType = declarationType
 	return f.applyOriginalErr
 }
 
@@ -251,6 +266,21 @@ func TestPublisherUploadsStandardImagesBeforeTextFill(t *testing.T) {
 	}
 }
 
+func TestPublisherPublicVisibilityStopBeforeSubmitSkipsOnlySelfSelection(t *testing.T) {
+	page := &fakePublishPage{}
+	request := PublishRequest{Title: "标题", Content: "正文", Tags: []string{"效率"}, ImagePaths: []string{"cover.jpg"}, StopBeforeSubmit: true, Visibility: PublishVisibilityPublic}
+	if err := (Publisher{}).PublishStandardOnlySelf(context.Background(), page, request); err != nil {
+		t.Fatalf("PublishStandardOnlySelf() error = %v", err)
+	}
+	wantCalls := []string{"open", "upload", "title", "content", "dismiss-overlays", "declare-original", "content-copy"}
+	if !reflect.DeepEqual(page.calls, wantCalls) {
+		t.Fatalf("calls = %#v, want %#v", page.calls, wantCalls)
+	}
+	if page.onlySelfVisible {
+		t.Fatal("onlySelfVisible = true, want false for public visibility")
+	}
+}
+
 func TestUploadInputSelectorsIncludeCreatorUploadInput(t *testing.T) {
 	if !reflect.DeepEqual(uploadInputSelectors, []string{"input.upload-input", `input[type="file"][accept*="image"]`, `input[type="file"][multiple]`, `input[type="file"]`, `input[type="file"][multiple][accept*=".jpg"]`, `input[type="file"][accept*=".jpg"]`}) {
 		t.Fatalf("uploadInputSelectors = %#v", uploadInputSelectors)
@@ -395,6 +425,374 @@ func TestPermissionDropdownSelectorMatchesRealWrapper(t *testing.T) {
 	}
 }
 
+func TestApplyCollectionSelectsMatchingCollection(t *testing.T) {
+	page := testPage(t)
+
+	html := `<!doctype html>
+<html>
+  <head><meta charset="utf-8"></head>
+  <body>
+    <div class="collection-plugin-wrapper">
+      <div class="collection-plugin-content">
+        <div class="collection-plugin-content-title">加入合集</div>
+        <button class="collection-plugin-button">选择合集</button>
+      </div>
+    </div>
+    <div class="d-popover d-popover-default collection-plugin-popover" style="display:none">
+      <div class="collection-plugin-popover-content">
+        <div class="item"><div class="item-content"><div class="item-label">AI科技日报</div></div></div>
+        <div class="item"><div class="item-content"><div class="item-label">AI用法</div></div></div>
+        <div class="popover-footer">创建合集</div>
+      </div>
+    </div>
+    <script>
+      const button = document.querySelector('.collection-plugin-button');
+      const popover = document.querySelector('.collection-plugin-popover');
+      button.addEventListener('mousedown', () => { popover.style.display = 'block'; });
+      document.querySelectorAll('.collection-plugin-popover .item').forEach((item) => {
+        item.addEventListener('mousedown', () => {
+          const label = item.querySelector('.item-label').textContent.trim();
+          button.textContent = label;
+          button.setAttribute('data-selected', label);
+          popover.style.display = 'none';
+        });
+      });
+    </script>
+  </body>
+</html>`
+	page.MustNavigate("data:text/html," + url.PathEscape(html))
+	page.MustWaitLoad()
+	page.MustElement("body")
+
+	rodPage := &rodPage{page: page}
+	if err := rodPage.applyCollection("AI科技日报"); err != nil {
+		t.Fatalf("applyCollection() error = %v", err)
+	}
+	got := page.MustElement(".collection-plugin-button").MustAttribute("data-selected")
+	if got == nil || *got != "AI科技日报" {
+		t.Fatalf("selected collection = %v, want AI科技日报", got)
+	}
+}
+
+func TestApplyOriginalDeclarationSelectsAIGeneratedType(t *testing.T) {
+	page := testPage(t)
+
+	html := `<!doctype html>
+<html>
+  <head><meta charset="utf-8"></head>
+  <body>
+    <div class="original-wrapper">
+      <div class="custom-switch-wrapper">
+        <div class="custom-switch-card">
+          <span class="custom-switch-text-content">原创声明</span>
+          <input type="checkbox" checked>
+        </div>
+      </div>
+      <div class="wrapper">
+        <div tabindex="1" class="d-select-wrapper d-inline-block custom-select-44">
+          <div class="d-select --color-text-title --color-bg-fill">
+            <div class="d-grid d-select-main d-select-main-prefix-indicator --color-text-title">
+              <div class="d-text d-select-placeholder d-text-ellipsis d-text-nowrap">添加内容类型声明</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="d-popover d-dropdown declaration-dropdown" style="display:none">
+      <div class="d-grid-item"><div class="custom-option">笔记含AI生成内容</div></div>
+      <div class="d-grid-item"><div class="custom-option">无声明</div></div>
+    </div>
+    <script>
+      const trigger = document.querySelector('.d-select-wrapper');
+      const dropdown = document.querySelector('.declaration-dropdown');
+      const placeholder = document.querySelector('.d-select-placeholder');
+      trigger.addEventListener('mousedown', (event) => {
+        if (!event.isTrusted) return;
+        window.declarationTriggerTrustedClickSeen = true;
+        dropdown.style.display = 'block';
+      });
+      document.querySelectorAll('.declaration-dropdown .d-grid-item').forEach((item) => {
+        item.addEventListener('mousedown', () => {
+          const label = item.textContent.trim();
+          placeholder.textContent = label;
+          placeholder.className = 'd-text d-select-content d-text-ellipsis d-text-nowrap';
+          trigger.setAttribute('data-selected', label);
+          dropdown.style.display = 'none';
+        });
+      });
+    </script>
+  </body>
+</html>`
+	page.MustNavigate("data:text/html," + url.PathEscape(html))
+	page.MustWaitLoad()
+	page.MustElement("body")
+
+	rodPage := &rodPage{page: page}
+	if err := rodPage.applyOriginalDeclaration(true, "ai_generated"); err != nil {
+		state := page.MustEval(`() => document.body.innerText.replace(/\s+/g, ' ').trim()`).String()
+		t.Fatalf("applyOriginalDeclaration() error = %v, state = %s", err, state)
+	}
+	selected := page.MustElement(".d-select-wrapper").MustAttribute("data-selected")
+	if selected == nil || *selected != "笔记含AI生成内容" {
+		t.Fatalf("selected declaration type = %v, want 笔记含AI生成内容", selected)
+	}
+	if trusted := page.MustEval(`() => window.declarationTriggerTrustedClickSeen === true`).Bool(); !trusted {
+		t.Fatal("declaration type select should open by a trusted click")
+	}
+}
+
+func TestApplyOriginalDeclarationSelectsAIGeneratedTypeFromNestedTrigger(t *testing.T) {
+	page := testPage(t)
+
+	html := `<!doctype html>
+<html>
+  <head><meta charset="utf-8"></head>
+  <body>
+    <div class="original-wrapper">
+      <div class="custom-switch-wrapper">
+        <div class="custom-switch-card">
+          <span class="custom-switch-text-content">原创声明</span>
+          <input type="checkbox" checked>
+        </div>
+      </div>
+      <div class="wrapper">
+        <div tabindex="1" class="d-select-wrapper d-inline-block custom-select-44" style="display:block;width:320px;height:100px;border:1px solid #ddd;">
+          <div class="d-select --color-text-title --color-bg-fill" style="display:block;width:110px;height:32px;">
+            <div class="d-grid d-select-main d-select-main-prefix-indicator --color-text-title" style="display:block;width:90px;height:24px;">
+              <div class="d-text d-select-placeholder d-text-ellipsis d-text-nowrap">添加内容类型声明</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="d-popover d-dropdown declaration-dropdown" style="display:none;width:180px;height:80px;">
+      <div class="d-grid-item"><div class="custom-option">笔记含AI生成内容</div></div>
+      <div class="d-grid-item"><div class="custom-option">无声明</div></div>
+    </div>
+    <script>
+      const trigger = document.querySelector('.d-select-main');
+      const dropdown = document.querySelector('.declaration-dropdown');
+      const wrapper = document.querySelector('.d-select-wrapper');
+      const placeholder = document.querySelector('.d-select-placeholder');
+      trigger.addEventListener('mousedown', (event) => {
+        if (!event.isTrusted) return;
+        window.declarationNestedTriggerTrustedClickSeen = true;
+        dropdown.style.display = 'block';
+      });
+      document.querySelectorAll('.declaration-dropdown .d-grid-item').forEach((item) => {
+        item.addEventListener('mousedown', () => {
+          const label = item.textContent.trim();
+          placeholder.textContent = label;
+          placeholder.className = 'd-text d-select-content d-text-ellipsis d-text-nowrap';
+          wrapper.setAttribute('data-selected', label);
+          dropdown.style.display = 'none';
+        });
+      });
+    </script>
+  </body>
+</html>`
+	page.MustNavigate("data:text/html," + url.PathEscape(html))
+	page.MustWaitLoad()
+	page.MustElement("body")
+
+	rodPage := &rodPage{page: page}
+	if err := rodPage.applyOriginalDeclaration(true, "ai_generated"); err != nil {
+		state := page.MustEval(`() => document.body.innerText.replace(/\s+/g, ' ').trim()`).String()
+		t.Fatalf("applyOriginalDeclaration() error = %v, state = %s", err, state)
+	}
+	selected := page.MustElement(".d-select-wrapper").MustAttribute("data-selected")
+	if selected == nil || *selected != "笔记含AI生成内容" {
+		t.Fatalf("selected declaration type = %v, want 笔记含AI生成内容", selected)
+	}
+	if trusted := page.MustEval(`() => window.declarationNestedTriggerTrustedClickSeen === true`).Bool(); !trusted {
+		t.Fatal("declaration type select should try the nested trusted trigger")
+	}
+}
+
+func TestApplyOriginalDeclarationAcceptsVisibleDeclarationOptionsOutsidePopover(t *testing.T) {
+	page := testPage(t)
+
+	html := `<!doctype html>
+<html>
+  <head><meta charset="utf-8"></head>
+  <body>
+    <div class="original-wrapper">
+      <div class="custom-switch-wrapper">
+        <div class="custom-switch-card">
+          <span class="custom-switch-text-content">原创声明</span>
+          <input type="checkbox" checked>
+        </div>
+      </div>
+      <div class="wrapper">
+        <div tabindex="1" class="d-select-wrapper d-inline-block custom-select-44">
+          <div class="d-select --color-text-title --color-bg-fill">
+            <div class="d-grid d-select-main d-select-main-prefix-indicator --color-text-title">
+              <div class="d-text d-select-placeholder d-text-ellipsis d-text-nowrap">添加内容类型声明</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="declaration-options declaration-dropdown" style="display:none;">
+      <div class="d-grid-item option-ai" style="display:block;width:180px;height:28px;">笔记含AI生成内容</div>
+      <div class="d-grid-item option-none" style="display:block;width:180px;height:28px;">无声明</div>
+    </div>
+    <script>
+      const trigger = document.querySelector('.d-select-wrapper');
+      const dropdown = document.querySelector('.declaration-dropdown');
+      const placeholder = document.querySelector('.d-select-placeholder');
+      const wrapper = document.querySelector('.d-select-wrapper');
+      trigger.addEventListener('mousedown', (event) => {
+        if (!event.isTrusted) return;
+        dropdown.style.display = 'contents';
+      });
+      document.querySelector('.option-ai').addEventListener('mousedown', () => {
+        placeholder.textContent = '笔记含AI生成内容';
+        wrapper.setAttribute('data-selected', '笔记含AI生成内容');
+        dropdown.style.display = 'none';
+      });
+    </script>
+  </body>
+</html>`
+	page.MustNavigate("data:text/html," + url.PathEscape(html))
+	page.MustWaitLoad()
+	page.MustElement("body")
+
+	rodPage := &rodPage{page: page}
+	if err := rodPage.applyOriginalDeclaration(true, "ai_generated"); err != nil {
+		state := page.MustEval(`() => document.body.innerText.replace(/\s+/g, ' ').trim()`).String()
+		t.Fatalf("applyOriginalDeclaration() error = %v, state = %s", err, state)
+	}
+	selected := page.MustElement(".d-select-wrapper").MustAttribute("data-selected")
+	if selected == nil || *selected != "笔记含AI生成内容" {
+		t.Fatalf("selected declaration type = %v, want 笔记含AI生成内容", selected)
+	}
+}
+
+func TestApplyOriginalDeclarationSelectsCurrentAIGeneratedTypeLabel(t *testing.T) {
+	page := testPage(t)
+
+	html := `<!doctype html>
+<html>
+  <head><meta charset="utf-8"></head>
+  <body>
+    <div class="original-wrapper">
+      <div class="custom-switch-wrapper">
+        <div class="custom-switch-card">
+          <span class="custom-switch-text-content">原创声明</span>
+          <input type="checkbox" checked>
+        </div>
+      </div>
+      <div class="wrapper">
+        <div tabindex="1" class="d-select-wrapper d-inline-block custom-select-44" style="display:block;width:220px;height:32px;">
+          <div class="d-select --color-text-title --color-bg-fill" style="display:block;width:220px;height:32px;">
+            <div class="d-grid d-select-main d-select-main-prefix-indicator --color-text-title" style="display:block;width:220px;height:32px;">
+              <div class="d-text d-select-placeholder d-text-ellipsis d-text-nowrap">添加内容类型声明</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="d-popover d-dropdown declaration-dropdown" style="display:none;width:220px;height:140px;">
+      <div class="d-grid-item option-fiction" style="display:block;width:200px;height:28px;">虚构演绎，仅供娱乐</div>
+      <div class="d-grid-item option-ai" style="display:block;width:200px;height:28px;">笔记含AI合成内容</div>
+      <div class="d-grid-item option-ad" style="display:block;width:200px;height:28px;">内容包含营销广告</div>
+      <div class="d-grid-item option-source" style="display:block;width:200px;height:28px;">内容来源声明</div>
+    </div>
+    <script>
+      const trigger = document.querySelector('.d-select-wrapper');
+      const dropdown = document.querySelector('.declaration-dropdown');
+      const placeholder = document.querySelector('.d-select-placeholder');
+      const wrapper = document.querySelector('.d-select-wrapper');
+      trigger.addEventListener('mousedown', (event) => {
+        if (!event.isTrusted) return;
+        dropdown.style.display = 'block';
+      });
+      document.querySelector('.option-ai').addEventListener('mousedown', () => {
+        placeholder.textContent = '笔记含AI合成内容';
+        wrapper.setAttribute('data-selected', '笔记含AI合成内容');
+        dropdown.style.display = 'none';
+      });
+    </script>
+  </body>
+</html>`
+	page.MustNavigate("data:text/html," + url.PathEscape(html))
+	page.MustWaitLoad()
+	page.MustElement("body")
+
+	rodPage := &rodPage{page: page}
+	if err := rodPage.applyOriginalDeclaration(true, "ai_generated"); err != nil {
+		state := page.MustEval(`() => document.body.innerText.replace(/\s+/g, ' ').trim()`).String()
+		t.Fatalf("applyOriginalDeclaration() error = %v, state = %s", err, state)
+	}
+	selected := page.MustElement(".d-select-wrapper").MustAttribute("data-selected")
+	if selected == nil || *selected != "笔记含AI合成内容" {
+		t.Fatalf("selected declaration type = %v, want 笔记含AI合成内容", selected)
+	}
+}
+
+func TestApplyOriginalDeclarationClicksInnerOptionContent(t *testing.T) {
+	page := testPage(t)
+
+	html := `<!doctype html>
+<html>
+  <head><meta charset="utf-8"></head>
+  <body>
+    <div class="original-wrapper">
+      <div class="custom-switch-wrapper">
+        <div class="custom-switch-card">
+          <span class="custom-switch-text-content">原创声明</span>
+          <input type="checkbox" checked>
+        </div>
+      </div>
+      <div class="wrapper">
+        <div tabindex="1" class="d-select-wrapper d-inline-block custom-select-44" style="display:block;width:220px;height:32px;">
+          <div class="d-select --color-text-title --color-bg-fill" style="display:block;width:220px;height:32px;">
+            <div class="d-grid d-select-main d-select-main-prefix-indicator --color-text-title" style="display:block;width:220px;height:32px;">
+              <div class="d-text d-select-placeholder d-text-ellipsis d-text-nowrap">添加内容类型声明</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="d-popover d-dropdown declaration-dropdown" style="display:none;width:220px;height:140px;">
+      <div class="d-grid-item" style="display:block;width:280px;height:28px;"><div class="d-grid d-option d-option-content" style="display:block;width:130px;height:28px;">虚构演绎，仅供娱乐</div></div>
+      <div class="d-grid-item" style="display:block;width:280px;height:28px;"><div class="d-grid d-option d-option-content option-ai" style="display:block;width:120px;height:28px;">笔记含AI合成内容</div></div>
+      <div class="d-grid-item" style="display:block;width:280px;height:28px;"><div class="d-grid d-option d-option-content" style="display:block;width:120px;height:28px;">内容包含营销广告</div></div>
+      <div class="d-grid-item" style="display:block;width:280px;height:28px;"><div class="d-grid d-option d-option-content" style="display:block;width:90px;height:28px;">内容来源声明</div></div>
+    </div>
+    <script>
+      const trigger = document.querySelector('.d-select-wrapper');
+      const dropdown = document.querySelector('.declaration-dropdown');
+      const placeholder = document.querySelector('.d-select-placeholder');
+      const wrapper = document.querySelector('.d-select-wrapper');
+      trigger.addEventListener('mousedown', (event) => {
+        if (!event.isTrusted) return;
+        dropdown.style.display = 'block';
+      });
+      document.querySelector('.option-ai').addEventListener('mousedown', () => {
+        placeholder.textContent = '笔记含AI合成内容';
+        wrapper.setAttribute('data-selected', '笔记含AI合成内容');
+        dropdown.style.display = 'none';
+      });
+    </script>
+  </body>
+</html>`
+	page.MustNavigate("data:text/html," + url.PathEscape(html))
+	page.MustWaitLoad()
+	page.MustElement("body")
+
+	rodPage := &rodPage{page: page}
+	if err := rodPage.applyOriginalDeclaration(true, "ai_generated"); err != nil {
+		state := page.MustEval(`() => document.body.innerText.replace(/\s+/g, ' ').trim()`).String()
+		t.Fatalf("applyOriginalDeclaration() error = %v, state = %s", err, state)
+	}
+	selected := page.MustElement(".d-select-wrapper").MustAttribute("data-selected")
+	if selected == nil || *selected != "笔记含AI合成内容" {
+		t.Fatalf("selected declaration type = %v, want 笔记含AI合成内容", selected)
+	}
+}
+
 func TestPublisherPublishesOnlySelfExplicitly(t *testing.T) {
 	page := &fakePublishPage{}
 	request := PublishRequest{Title: "标题", Content: "正文", ImagePaths: []string{"cover.jpg"}}
@@ -426,33 +824,39 @@ func TestPublisherPreservesUploadInputMissingError(t *testing.T) {
 
 func TestPublisherOnlySelfStopBeforeSubmitAppliesPreSubmitHooks(t *testing.T) {
 	page := &fakePublishPage{}
-	request := PublishRequest{Title: "标题", Content: "正文", ImagePaths: []string{"cover.jpg"}, StopBeforeSubmit: true, DeclareOriginal: true, AllowContentCopy: false}
+	request := PublishRequest{Title: "标题", Content: "正文", ImagePaths: []string{"cover.jpg"}, Collection: "AI科技日报", StopBeforeSubmit: true, DeclareOriginal: true, OriginalDeclarationType: "ai_generated", AllowContentCopy: false}
 	if err := (Publisher{}).PublishStandardOnlySelf(context.Background(), page, request); err != nil {
 		t.Fatalf("PublishStandardOnlySelf() error = %v", err)
 	}
-	wantCalls := []string{"open", "upload", "title", "content", "dismiss-overlays", "declare-original", "content-copy", "set-only-self"}
+	wantCalls := []string{"open", "upload", "title", "content", "dismiss-overlays", "collection", "declare-original", "content-copy", "set-only-self"}
 	if !reflect.DeepEqual(page.calls, wantCalls) {
 		t.Fatalf("calls = %#v, want %#v", page.calls, wantCalls)
 	}
+	if page.collection != "AI科技日报" {
+		t.Fatalf("collection = %q, want AI科技日报", page.collection)
+	}
 	if !page.onlySelfVisible {
 		t.Fatal("expected only-self visibility to be applied before stopping")
 	}
-	if !page.originalApplied {
-		t.Fatal("expected original declaration to be applied before stopping")
+	if !page.originalApplied || page.originalDeclarationType != "ai_generated" {
+		t.Fatalf("expected original declaration type to be applied before stopping, page = %#v", page)
 	}
 }
 
 func TestPublisherSetsScheduleTimeBeforeSubmit(t *testing.T) {
 	page := &fakePublishPage{}
 	scheduledAt := time.Date(2026, 4, 11, 20, 30, 0, 0, time.FixedZone("CST", 8*60*60))
-	request := PublishRequest{Title: "标题", Content: "正文", Tags: []string{"效率"}, ImagePaths: []string{"cover.jpg"}, ScheduleTime: &scheduledAt}
+	request := PublishRequest{Title: "标题", Content: "正文", Tags: []string{"效率"}, ImagePaths: []string{"cover.jpg"}, ScheduleTime: &scheduledAt, Collection: "AI科技日报"}
 	if err := (Publisher{}).PublishStandardScheduled(context.Background(), page, request); err != nil {
 		t.Fatalf("PublishStandardScheduled() error = %v", err)
 	}
-	wantCalls := []string{"open", "upload", "title", "content", "dismiss-overlays", "declare-original", "content-copy", "set-schedule", "submit-scheduled", "confirm-scheduled"}
+	wantCalls := []string{"open", "upload", "title", "content", "dismiss-overlays", "collection", "declare-original", "content-copy", "set-schedule", "submit-scheduled", "confirm-scheduled"}
 	if !reflect.DeepEqual(page.calls, wantCalls) {
 		t.Fatalf("calls = %#v, want %#v", page.calls, wantCalls)
 	}
+	if page.collection != "AI科技日报" {
+		t.Fatalf("collection = %q, want AI科技日报", page.collection)
+	}
 	if !page.scheduledAt.Equal(scheduledAt) {
 		t.Fatalf("scheduledAt = %v, want %v", page.scheduledAt, scheduledAt)
 	}
@@ -471,7 +875,7 @@ func TestPublisherReturnsScheduleErrorWhenControlsMissing(t *testing.T) {
 func TestPublisherScheduledFlowAppliesPreSubmitHooks(t *testing.T) {
 	page := &fakePublishPage{}
 	scheduledAt := time.Date(2026, 4, 11, 20, 30, 0, 0, time.FixedZone("CST", 8*60*60))
-	request := PublishRequest{Title: "标题", Content: "正文", ImagePaths: []string{"cover.jpg"}, ScheduleTime: &scheduledAt, DeclareOriginal: true, AllowContentCopy: false}
+	request := PublishRequest{Title: "标题", Content: "正文", ImagePaths: []string{"cover.jpg"}, ScheduleTime: &scheduledAt, DeclareOriginal: true, OriginalDeclarationType: "ai_generated", AllowContentCopy: false}
 	if err := (Publisher{}).PublishStandardScheduled(context.Background(), page, request); err != nil {
 		t.Fatalf("PublishStandardScheduled() error = %v", err)
 	}
@@ -479,8 +883,8 @@ func TestPublisherScheduledFlowAppliesPreSubmitHooks(t *testing.T) {
 	if !reflect.DeepEqual(page.calls, wantCalls) {
 		t.Fatalf("calls = %#v, want %#v", page.calls, wantCalls)
 	}
-	if !page.originalApplied {
-		t.Fatal("expected original declaration hook to run")
+	if !page.originalApplied || page.originalDeclarationType != "ai_generated" {
+		t.Fatalf("expected original declaration type hook to run, page = %#v", page)
 	}
 	if page.contentCopyAllowed {
 		t.Fatal("expected content copy hook to disable copy")
@@ -1311,7 +1715,7 @@ func TestApplyOriginalDeclarationChecksUncheckedOriginalBox(t *testing.T) {
 	page.MustWaitLoad()
 
 	rodPage := &rodPage{page: page}
-	if err := rodPage.applyOriginalDeclaration(true); err != nil {
+	if err := rodPage.applyOriginalDeclaration(true, ""); err != nil {
 		t.Fatalf("applyOriginalDeclaration(true) error = %v", err)
 	}
 	if !page.MustElement("#original").MustProperty("checked").Bool() {
@@ -1361,7 +1765,7 @@ func TestApplyOriginalDeclarationChecksAgreementInModal(t *testing.T) {
 	page.MustWaitLoad()
 
 	rodPage := &rodPage{page: page}
-	if err := rodPage.applyOriginalDeclaration(true); err != nil {
+	if err := rodPage.applyOriginalDeclaration(true, ""); err != nil {
 		t.Fatalf("applyOriginalDeclaration(true) error = %v", err)
 	}
 	if !page.MustElement("#original").MustProperty("checked").Bool() {
@@ -1397,7 +1801,7 @@ func TestApplyOriginalDeclarationClicksConfirmButtonInModal(t *testing.T) {
 	page.MustWaitLoad()
 
 	rodPage := &rodPage{page: page}
-	if err := rodPage.applyOriginalDeclaration(true); err != nil {
+	if err := rodPage.applyOriginalDeclaration(true, ""); err != nil {
 		t.Fatalf("applyOriginalDeclaration(true) error = %v", err)
 	}
 	confirmed := page.MustEval(`() => document.body.getAttribute('data-original-confirmed') || ''`).String()
@@ -1450,7 +1854,7 @@ func TestApplyOriginalDeclarationClicksEntryBeforeConfirmingModal(t *testing.T)
 	page.MustWaitLoad()
 
 	rodPage := &rodPage{page: page}
-	if err := rodPage.applyOriginalDeclaration(true); err != nil {
+	if err := rodPage.applyOriginalDeclaration(true, ""); err != nil {
 		t.Fatalf("applyOriginalDeclaration(true) error = %v", err)
 	}
 	confirmed := page.MustEval(`() => document.body.getAttribute('data-original-confirmed') || ''`).String()
@@ -1502,7 +1906,7 @@ func TestApplyOriginalDeclarationUsesVisibleSwitchAndConfirmsPrompt(t *testing.T
 	page.MustWaitLoad()
 
 	rodPage := &rodPage{page: page}
-	if err := rodPage.applyOriginalDeclaration(true); err != nil {
+	if err := rodPage.applyOriginalDeclaration(true, ""); err != nil {
 		t.Fatalf("applyOriginalDeclaration(true) error = %v", err)
 	}
 	if !page.MustElement("#original").MustProperty("checked").Bool() {
@@ -1537,7 +1941,7 @@ func TestApplyOriginalDeclarationClicksWrapperWithHiddenInput(t *testing.T) {
 	page.MustWaitLoad()
 
 	rodPage := &rodPage{page: page}
-	if err := rodPage.applyOriginalDeclaration(true); err != nil {
+	if err := rodPage.applyOriginalDeclaration(true, ""); err != nil {
 		t.Fatalf("applyOriginalDeclaration(true) error = %v", err)
 	}
 	if !page.MustElement("#original").MustProperty("checked").Bool() {
diff --git a/internal/xhs/request.go b/internal/xhs/request.go
index 35fd59d..71858b1 100644
--- a/internal/xhs/request.go
+++ b/internal/xhs/request.go
@@ -11,10 +11,20 @@ const scheduleTimeLayout = "2006-01-02 15:04:05"
 type PublishMode string
 
 const (
-	PublishModeOnlySelf PublishMode = "only-self"
-	PublishModeSchedule PublishMode = "schedule"
+	PublishModeImmediate PublishMode = "immediate"
+	PublishModeOnlySelf  PublishMode = PublishModeImmediate
+	PublishModeSchedule  PublishMode = "schedule"
 )
 
+type PublishVisibility string
+
+const (
+	PublishVisibilityOnlySelf PublishVisibility = "only-self"
+	PublishVisibilityPublic   PublishVisibility = "public"
+)
+
+const OriginalDeclarationTypeAIGenerated = "ai_generated"
+
 type MediaKind string
 
 const (
@@ -23,18 +33,21 @@ const (
 )
 
 type PublishRequest struct {
-	Account          string
-	Title            string
-	Content          string
-	Tags             []string
-	Mode             PublishMode
-	ScheduleTime     *time.Time
-	MediaKind        MediaKind
-	ImagePaths       []string
-	Live             LivePublishSource
-	DeclareOriginal  bool
-	AllowContentCopy bool
-	StopBeforeSubmit bool
+	Account                 string
+	Title                   string
+	Content                 string
+	Tags                    []string
+	Mode                    PublishMode
+	Visibility              PublishVisibility
+	ScheduleTime            *time.Time
+	Collection              string
+	MediaKind               MediaKind
+	ImagePaths              []string
+	Live                    LivePublishSource
+	DeclareOriginal         bool
+	OriginalDeclarationType string
+	AllowContentCopy        bool
+	StopBeforeSubmit        bool
 }
 
 type LivePublishSource struct {
@@ -58,12 +71,32 @@ type PublishResult struct {
 
 func ValidateMode(input string) (PublishMode, error) {
 	switch PublishMode(strings.TrimSpace(input)) {
-	case "", PublishModeOnlySelf:
-		return PublishModeOnlySelf, nil
+	case "", PublishModeImmediate:
+		return PublishModeImmediate, nil
 	case PublishModeSchedule:
 		return PublishModeSchedule, nil
 	default:
-		return "", fmt.Errorf("mode must be only-self or schedule")
+		return "", fmt.Errorf("mode must be immediate or schedule")
+	}
+}
+
+func ValidateVisibility(input string) (PublishVisibility, error) {
+	switch PublishVisibility(strings.TrimSpace(input)) {
+	case "", PublishVisibilityOnlySelf:
+		return PublishVisibilityOnlySelf, nil
+	case PublishVisibilityPublic:
+		return PublishVisibilityPublic, nil
+	default:
+		return "", fmt.Errorf("visibility must be public or only-self")
+	}
+}
+
+func ValidateOriginalDeclarationType(input string) (string, error) {
+	switch trimmed := strings.TrimSpace(input); trimmed {
+	case "", OriginalDeclarationTypeAIGenerated:
+		return trimmed, nil
+	default:
+		return "", fmt.Errorf("original declaration type must be empty or %s", OriginalDeclarationTypeAIGenerated)
 	}
 }
 
@@ -77,10 +110,20 @@ func (r PublishRequest) Validate(now time.Time) error {
 	if strings.TrimSpace(r.Content) == "" && len(trimmedNonEmpty(r.Tags)) == 0 {
 		return fmt.Errorf("content or tags are required")
 	}
+	if _, err := ValidateVisibility(string(r.Visibility)); err != nil {
+		return err
+	}
+	declarationType, err := ValidateOriginalDeclarationType(r.OriginalDeclarationType)
+	if err != nil {
+		return err
+	}
+	if declarationType != "" && !r.DeclareOriginal {
+		return fmt.Errorf("original declaration type requires declare_original")
+	}
 	switch r.Mode {
-	case PublishModeOnlySelf:
+	case PublishModeImmediate:
 		if r.ScheduleTime != nil {
-			return fmt.Errorf("only-self mode forbids schedule time")
+			return fmt.Errorf("immediate mode forbids schedule time")
 		}
 	case PublishModeSchedule:
 		if r.ScheduleTime == nil {
@@ -95,7 +138,7 @@ func (r PublishRequest) Validate(now time.Time) error {
 			return fmt.Errorf("schedule lead time must be at least 15 minutes")
 		}
 	default:
-		return fmt.Errorf("mode must be only-self or schedule")
+		return fmt.Errorf("mode must be immediate or schedule")
 	}
 
 	switch r.MediaKind {
diff --git a/internal/xhs/request_test.go b/internal/xhs/request_test.go
index af57bfd..477d7e5 100644
--- a/internal/xhs/request_test.go
+++ b/internal/xhs/request_test.go
@@ -47,6 +47,66 @@ func TestPublishRequestValidateAcceptsScheduledRequest(t *testing.T) {
 	}
 }
 
+func TestValidateModeAcceptsImmediateAndSchedule(t *testing.T) {
+	cases := map[string]PublishMode{
+		"":          PublishModeImmediate,
+		"immediate": PublishModeImmediate,
+		"schedule":  PublishModeSchedule,
+	}
+	for input, want := range cases {
+		got, err := ValidateMode(input)
+		if err != nil {
+			t.Fatalf("ValidateMode(%q) error = %v", input, err)
+		}
+		if got != want {
+			t.Fatalf("ValidateMode(%q) = %q, want %q", input, got, want)
+		}
+	}
+}
+
+func TestValidateModeRejectsVisibilityValue(t *testing.T) {
+	if _, err := ValidateMode("only-self"); err == nil || !strings.Contains(err.Error(), "mode must be immediate or schedule") {
+		t.Fatalf("ValidateMode() error = %v, want mode validation error", err)
+	}
+}
+
+func TestValidateVisibilityAcceptsPublicAndOnlySelf(t *testing.T) {
+	for _, input := range []string{"", "only-self", "public"} {
+		if _, err := ValidateVisibility(input); err != nil {
+			t.Fatalf("ValidateVisibility(%q) error = %v", input, err)
+		}
+	}
+}
+
+func TestValidateVisibilityRejectsInvalidValue(t *testing.T) {
+	if _, err := ValidateVisibility("friends"); err == nil || !strings.Contains(err.Error(), "visibility must be public or only-self") {
+		t.Fatalf("ValidateVisibility() error = %v, want visibility validation error", err)
+	}
+}
+
+func TestPublishRequestValidateDefaultsVisibilityToOnlySelf(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"}}
+	if err := request.Validate(now); err != nil {
+		t.Fatalf("Validate() error = %v", err)
+	}
+}
+
+func TestPublishRequestValidateAcceptsPublicVisibility(t *testing.T) {
+	now := shanghaiTime(2026, 4, 10, 12, 0, 0)
+	request := PublishRequest{Account: "creator-a", Title: "标题", Content: "正文", Mode: PublishModeOnlySelf, Visibility: PublishVisibilityPublic, MediaKind: MediaKindStandard, ImagePaths: []string{"cover.jpg"}}
+	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") {
+		t.Fatalf("Validate() error = %v, want visibility validation error", err)
+	}
+}
+
 func TestPublishRequestValidateRequiresImageForStandardRequest(t *testing.T) {
 	request := PublishRequest{Account: "creator-a", Title: "标题", Content: "正文", Mode: PublishModeOnlySelf, MediaKind: MediaKindStandard}
 	if err := request.Validate(shanghaiTime(2026, 4, 10, 12, 0, 0)); err == nil || !strings.Contains(err.Error(), "at least one image path is required") {
@@ -54,11 +114,11 @@ func TestPublishRequestValidateRequiresImageForStandardRequest(t *testing.T) {
 	}
 }
 
-func TestPublishRequestValidateRejectsOnlySelfWithScheduleTime(t *testing.T) {
+func TestPublishRequestValidateRejectsImmediateWithScheduleTime(t *testing.T) {
 	now := shanghaiTime(2026, 4, 10, 12, 0, 0)
 	scheduledAt := shanghaiTime(2026, 4, 10, 12, 20, 0)
-	request := PublishRequest{Account: "creator-a", Title: "标题", Content: "正文", Mode: PublishModeOnlySelf, ScheduleTime: &scheduledAt, MediaKind: MediaKindStandard, ImagePaths: []string{"cover.jpg"}}
-	if err := request.Validate(now); err == nil || !strings.Contains(err.Error(), "only-self mode forbids schedule time") {
+	request := PublishRequest{Account: "creator-a", Title: "标题", Content: "正文", Mode: PublishModeImmediate, ScheduleTime: &scheduledAt, MediaKind: MediaKindStandard, ImagePaths: []string{"cover.jpg"}}
+	if err := request.Validate(now); err == nil || !strings.Contains(err.Error(), "immediate mode forbids schedule time") {
 		t.Fatalf("Validate() error = %v", err)
 	}
 }