@zzclub/pipeline 0.4.0 → 0.9.0

package/src/wechat-preview/themes.ts

@@ -73,6 +73,16 @@ const THEMES: Record<string, WechatPreviewTheme> = {
       "--muted": "210 14% 96%",
       "--muted-foreground": "215 8% 42%",
       "--border": "220 10% 86%",
+      "--brand": "#ca6093",
+      "--brand-soft": "#d4789e",
+      "--brand-bg": "rgba(202, 96, 147, 0.08)",
+      "--brand-bg-deep": "rgba(202, 96, 147, 0.14)",
+      "--text": "#202124",
+      "--text-soft": "#5f6368",
+      "--text-mid": "#3c4043",
+      "--divider": "#dadce0",
+      "--bg-page": "#ffffff",
+      "--bg-warm": "#f8f9fa",
     },
     exportTheme: {
       containerStyle: buildContainerStyle({
@@ -89,9 +99,9 @@ const THEMES: Record<string, WechatPreviewTheme> = {
         "'SweiCurveLeg', 'PingFang SC', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif",
       bodyColor: "#202124",
       mutedColor: "#5f6368",
-      primaryColor: "#111111",
+      primaryColor: "#ca6093",
       dividerColor: "#dadce0",
-      blockquoteBorderColor: "#3c4043",
+      blockquoteBorderColor: "#ca6093",
       bodyLineHeight: "1.92",
       bodyLetterSpacing: "0.03em",
     },
@@ -101,39 +111,75 @@ const THEMES: Record<string, WechatPreviewTheme> = {
     account: "ancientone",
     editorVars: {
       ...BASE_EDITOR_VARS,
-      "--primary": "330 50% 58%",
-      "--ring": "330 50% 58%",
-      "--accent": "330 35% 96%",
-      "--accent-foreground": "334 28% 22%",
-      "--muted": "336 38% 97%",
-      "--border": "334 26% 88%",
+      "--primary": "337 38% 58%",
+      "--ring": "337 38% 58%",
+      "--accent": "337 30% 96%",
+      "--accent-foreground": "337 28% 22%",
+      "--muted": "338 25% 97%",
+      "--border": "337 20% 88%",
+      "--brand": "#ca6093",
+      "--brand-soft": "#d4789e",
+      "--brand-bg": "rgba(202, 96, 147, 0.08)",
+      "--brand-bg-deep": "rgba(202, 96, 147, 0.14)",
+      "--text": "#2c2c2c",
+      "--text-soft": "#8c8c8c",
+      "--text-mid": "#5c5c5c",
+      "--divider": "#d8d0d3",
+      "--bg-page": "#fefefe",
+      "--bg-warm": "#faf8f9",
     },
     exportTheme: {
       containerStyle: buildContainerStyle({
-        background: "#fffafb",
-        color: "#4a3a44",
+        background: "#fefefe",
+        color: "#2c2c2c",
         fontFamily:
-          "'SweiCurveLeg', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif",
-        lineHeight: "1.94",
-        letterSpacing: "0.035em",
+          "'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', -apple-system, 'SF Pro Text', 'Noto Sans SC', sans-serif",
+        lineHeight: "2.0",
+        letterSpacing: "0.015em",
       }),
       footerText: "公众号 · 古一软件",
-      footerStyle: buildFooterStyle("#b08a9d"),
+      footerStyle: buildFooterStyle("#8c8c8c"),
       fontFamily:
-        "'SweiCurveLeg', 'PingFang SC', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif",
-      bodyColor: "#4a3a44",
-      mutedColor: "#7a6271",
-      primaryColor: "#b35d85",
-      dividerColor: "#ead5df",
-      blockquoteBorderColor: "#d6a8bc",
-      bodyLineHeight: "1.94",
-      bodyLetterSpacing: "0.035em",
+        "'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', -apple-system, 'SF Pro Text', 'Noto Sans SC', sans-serif",
+      bodyColor: "#2c2c2c",
+      mutedColor: "#8c8c8c",
+      primaryColor: "#ca6093",
+      dividerColor: "#d8d0d3",
+      blockquoteBorderColor: "#ca6093",
+      bodyLineHeight: "2.0",
+      bodyLetterSpacing: "0.015em",
     },
   },
 };
 
-export function getWechatPreviewTheme(account: string): WechatPreviewTheme {
-  return THEMES[account] ?? THEMES.default;
+function definedValues<T extends Record<string, unknown>>(obj: T): Partial<T> {
+  const result: Record<string, unknown> = {};
+  for (const key of Object.keys(obj)) {
+    if (obj[key] !== undefined) {
+      result[key] = obj[key];
+    }
+  }
+  return result as Partial<T>;
+}
+
+export function getWechatPreviewTheme(
+  account: string,
+  overrides?: {
+    editorVars?: Record<string, string>;
+    exportTheme?: Partial<WechatExportTheme>;
+  },
+): WechatPreviewTheme {
+  const base = THEMES[account] ?? THEMES.default;
+  if (!overrides) return base;
+
+  const hasEditorVars = overrides.editorVars && Object.keys(overrides.editorVars).length > 0;
+  const hasExportTheme = overrides.exportTheme && Object.keys(definedValues(overrides.exportTheme)).length > 0;
+
+  return {
+    ...base,
+    editorVars: hasEditorVars ? { ...base.editorVars, ...overrides.editorVars } : base.editorVars,
+    exportTheme: hasExportTheme ? { ...base.exportTheme, ...definedValues(overrides.exportTheme!) } : base.exportTheme,
+  };
 }
 
 export function getWechatPreviewStyleName(account: string): string {

package/src/wechat-preview/wechat-formatter.test.ts

@@ -137,7 +137,6 @@ describe("normalizeHrStyles", () => {
     const input = '<hr style="border: 1px solid red">';
     const result = normalizeHrStyles(input);
     expect(result).toContain("border: none");
-    expect(result).toContain("border-top: 1px solid #dadce0");
     expect(result).toContain("height: 0");
   });
 });

package/src/wechat-preview/wechat-formatter.ts

@@ -276,7 +276,6 @@ export function normalizeHrStyles(html: string): string {
         'background-color': 'transparent',
         'background-image': 'none',
         'border': 'none',
-        'border-top': '1px solid #dadce0',
         'overflow-x': 'visible',
         'font-size': '0',
         'line-height': '0',
@@ -486,32 +485,40 @@ function normalizeTypography(
   if (['h1', 'h2', 'h3', 'h4', 'h5', 'h6'].includes(originalTagName)) {
     clearTextFrame()
     setStyle(styles, 'font-family', fontFamily)
-    setStyle(styles, 'font-weight', originalTagName === 'h3' ? '600' : '700')
-    setStyle(styles, 'color', originalTagName === 'h1' ? bodyColor : primaryColor)
 
     if (originalTagName === 'h1') {
-      setStyle(styles, 'font-size', '2.1em')
-      setStyle(styles, 'line-height', '1.32')
-      setStyle(styles, 'letter-spacing', '-0.02em')
-      setStyle(styles, 'margin', '1.6em 0 0.7em')
+      setStyle(styles, 'font-weight', '700')
+      setStyle(styles, 'color', bodyColor)
+      setStyle(styles, 'font-size', '1.625rem')
+      setStyle(styles, 'line-height', '1.3')
+      setStyle(styles, 'letter-spacing', '-0.01em')
+      setStyle(styles, 'margin', '3em 0 1em')
     }
     else if (originalTagName === 'h2') {
-      setStyle(styles, 'font-size', '18px')
-      setStyle(styles, 'line-height', '1.4')
-      setStyle(styles, 'letter-spacing', '-0.01em')
-      setStyle(styles, 'margin', '1.45em 0 0.62em')
+      setStyle(styles, 'font-weight', '700')
+      setStyle(styles, 'color', primaryColor)
+      setStyle(styles, 'font-size', '1.25rem')
+      setStyle(styles, 'line-height', '1.35')
+      setStyle(styles, 'letter-spacing', '0.02em')
+      setStyle(styles, 'margin', '2.4em 0 0.9em')
     }
     else if (originalTagName === 'h3') {
-      setStyle(styles, 'font-size', '1.14em')
-      setStyle(styles, 'line-height', '1.58')
-      setStyle(styles, 'letter-spacing', '0.01em')
-      setStyle(styles, 'margin', '1.28em 0 0.52em')
+      setStyle(styles, 'font-weight', '600')
+      setStyle(styles, 'color', bodyColor)
+      setStyle(styles, 'font-size', '1.125rem')
+      setStyle(styles, 'line-height', '1.45')
+      setStyle(styles, 'letter-spacing', '0.015em')
+      setStyle(styles, 'margin', '2em 0 0.65em')
+      setStyle(styles, 'padding-bottom', '0.5em')
+      setStyle(styles, 'border-bottom', `1px solid ${dividerColor}`)
     }
     else {
-      setStyle(styles, 'font-size', '1em')
-      setStyle(styles, 'line-height', '1.65')
+      setStyle(styles, 'font-weight', '600')
+      setStyle(styles, 'color', bodyColor)
+      setStyle(styles, 'font-size', '1rem')
+      setStyle(styles, 'line-height', '1.5')
       setStyle(styles, 'letter-spacing', '0.02em')
-      setStyle(styles, 'margin', '1.15em 0 0.45em')
+      setStyle(styles, 'margin', '1.25em 0 0.5em')
     }
     return
   }
@@ -557,6 +564,17 @@ function normalizeTypography(
     return
   }
 
+  if (outTagName === 'figcaption') {
+    clearTextFrame()
+    setStyle(styles, 'font-family', fontFamily)
+    setStyle(styles, 'font-size', '12px')
+    setStyle(styles, 'line-height', '1.6')
+    setStyle(styles, 'color', mutedColor)
+    setStyle(styles, 'text-align', 'center')
+    setStyle(styles, 'margin', '8px 0 0 0')
+    return
+  }
+
   if (outTagName === 'span' || outTagName === 'strong' || outTagName === 'em' || outTagName === 'b' || outTagName === 'i' || outTagName === 'u' || outTagName === 's' || outTagName === 'del') {
     clearTextFrame()
     setStyle(styles, 'font-family', fontFamily)
@@ -662,13 +680,20 @@ function getOneDomCssStyle(
     const textParent = node.parentElement
     const shouldPreserveWhitespace = isInCodeBlock || hasBlockCodeAncestor(textParent)
     // 在代码块内,保留所有空格和换行
-    // 将所有空格转换为   以防止被 HTML 合并
+    // 先转义 HTML 特殊字符，防止代码块内的 <img>, ![ ]( ) 等被下游正则误匹配
     if (shouldPreserveWhitespace && text) {
       return text
-        .replace(/ /g, '\u00A0') // 所有空格转为 &nbsp;
-        .replace(/\t/g, '\u00A0\u00A0\u00A0\u00A0') // 制表符转为 4 个 &nbsp;
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/ /g, '\u00A0')
+        .replace(/\t/g, '\u00A0\u00A0\u00A0\u00A0')
     }
     return text
+      .replace(/&/g, '&amp;')
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;')
+
   }
 
   // 注释节点
@@ -874,8 +899,8 @@ function getOneDomCssStyle(
       const val = (el as HTMLInputElement).value
       if (!val)
         return ''
-      // 返回居中的 figcaption
-      return `<figcaption style="margin-top: 6px; text-align: center; color: #888; font-size: 14px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;">${val}</figcaption>`
+      // 返回居中的 figcaption（小号文字，无装饰符号）
+      return `<figcaption style="margin-top: 8px; text-align: center; color: #8c8c8c; font-size: 12px; line-height: 1.6;">${val}</figcaption>`
     }
     return ''
   }

package/src/workflow.test.ts

@@ -14,6 +14,7 @@ import { prepare } from "./commands/prepare";
 import { prepareFinalize } from "./commands/prepare-finalize";
 import { render } from "./commands/render";
 import { publish } from "./commands/publish";
+import { republish } from "./commands/republish";
 import { reconcile } from "./commands/reconcile";
 import { review } from "./commands/review";
 import { status } from "./commands/status";
@@ -22,8 +23,11 @@ import { tasks } from "./commands/tasks";
 import { renderPostsRelativePath, resolveWorkspacePaths, resolveWorkspaceRoot } from "./config";
 import { resolveFullRoute } from "./routes";
 import { resolveAuthoring } from "./profiles";
+import { WorkflowStateSchema } from "./schema/state";
 import { defaultState, readState, validateForPhase, writeState } from "./state";
 import { getTaskByStatePath } from "./task-manager";
+import { dedupeTargets, filterIdempotent } from "./providers/publish-core";
+import { getPublishProvider, listPublishProviders } from "./providers";
 import { stripLeadingH1, stripLeadingTitleHeading } from "./text";
 
 const TEST_CONFIG_PATH = join(
@@ -1211,6 +1215,7 @@ describe("config", () => {
               appId: "",
               appSecret: "",
               customCss: null,
+              theme: { editorVars: {}, exportTheme: {} },
             },
           },
         },
@@ -1336,7 +1341,7 @@ describe("publish validation", () => {
     expect(updated.phase.current).toBe("publish");
     expect(updated.phase.publish.status).toBe("pending");
     expect(updated.publish.results[0]?.status).toBe("failed");
-    expect(updated.publish.results[0]?.detail).toContain("Unsupported workflow publish route: blog");
+    expect(updated.publish.results[0]?.detail).toContain("blog publish command failed");
 
     const task = await getTaskByStatePath(statePath);
     expect(task.blockers).toEqual([]);
@@ -2085,3 +2090,291 @@ describe("newspic_render default behavior", () => {
     expect(finalState.intent.newspic_render?.pagination_mode ?? "single").toBe("single");
   });
 });
+
+describe("publish_targets and multi-account", () => {
+  test("PublishResult schema accepts account field with default", () => {
+    const state = WorkflowStateSchema.parse({});
+    // publish.results should accept items with account field
+    const result = {
+      route: "wechat-article" as const,
+      account: "ancientone",
+      status: "success" as const,
+      detail: null,
+      published_at: "2026-06-14T10:00:00Z",
+      content_version: 1,
+      render_version: 1,
+    };
+    state.publish.results.push(result);
+    const parsed = WorkflowStateSchema.parse(state);
+    expect(parsed.publish.results[0].account).toBe("ancientone");
+  });
+
+  test("PublishResult defaults account to 'default' when missing", () => {
+    const result = {
+      route: "wechat-article",
+      status: "success",
+      detail: null,
+      published_at: null,
+      content_version: 0,
+      render_version: 0,
+    };
+    const state = WorkflowStateSchema.parse({
+      publish: { results: [result] },
+    });
+    expect(state.publish.results[0].account).toBe("default");
+  });
+
+  test("publish_targets field defaults to empty array", () => {
+    const state = WorkflowStateSchema.parse({});
+    expect(state.publish_targets).toEqual([]);
+  });
+
+  test("publish_targets accepts array of {route, account}", () => {
+    const state = WorkflowStateSchema.parse({
+      publish_targets: [
+        { route: "wechat-article", account: "default" },
+        { route: "wechat-article", account: "ancientone" },
+        { route: "blog", account: "default" },
+      ],
+    });
+    expect(state.publish_targets).toHaveLength(3);
+    expect(state.publish_targets[1].account).toBe("ancientone");
+  });
+
+  test("publish_targets account defaults to 'default' when omitted", () => {
+    const state = WorkflowStateSchema.parse({
+      publish_targets: [{ route: "blog" }],
+    });
+    expect(state.publish_targets[0].account).toBe("default");
+  });
+});
+
+describe("provider accountOverride", () => {
+  test("PublishRouteContext accepts accountOverride", () => {
+    // Type-level test: this should compile
+    const ctx: import("./providers").PublishRouteContext = {
+      state: {} as any,
+      dryRun: true,
+      config: {} as any,
+      workspacePaths: {} as any,
+      accountOverride: "ancientone",
+    };
+    expect(ctx.accountOverride).toBe("ancientone");
+  });
+});
+
+describe("PUBLISH_PROVIDERS", () => {
+  test("blog is registered as publish provider", () => {
+    const provider = getPublishProvider("blog");
+    expect(provider).toBeDefined();
+    expect(typeof provider).toBe("function");
+  });
+
+  test("listPublishProviders includes blog", () => {
+    const providers = listPublishProviders();
+    expect(providers).toContain("blog");
+  });
+});
+
+describe("executePublishTargets helpers", () => {
+  test("dedupeTargets deduplicates by route+account", () => {
+    const targets = [
+      { route: "wechat-article" as const, account: "default" },
+      { route: "wechat-article" as const, account: "default" },  // duplicate
+      { route: "blog" as const, account: "default" },
+    ];
+    const deduped = dedupeTargets(targets);
+    expect(deduped).toHaveLength(2);
+  });
+
+  test("filterIdempotent filters out already-published targets", () => {
+    const targets = [
+      { route: "wechat-article" as const, account: "default" },
+      { route: "blog" as const, account: "default" },
+    ];
+    const existingResults = [
+      {
+        route: "wechat-article" as const,
+        account: "default",
+        status: "success" as const,
+        detail: null,
+        published_at: "2026-06-14T10:00:00Z",
+        content_version: 1,
+        render_version: 1,
+      },
+    ];
+    const filtered = filterIdempotent(targets, existingResults, 1, 1);
+    expect(filtered).toHaveLength(1);
+    expect(filtered[0].route).toBe("blog");
+  });
+});
+
+describe("publish command with publish_targets", () => {
+  test("publish iterates publish_targets when present", async () => {
+    const tmpDir = await makeTempDir("zzhub-test-publish-targets-");
+    const statePath = join(tmpDir, "state.json");
+    const state = defaultState();
+    state.run_id = "test-run";
+    state.workspace_root = tmpDir;
+    state.state_path = statePath;
+    state.asset_path = tmpDir;
+    state.route.primary = "wechat-article";
+    state.route.account = "default";
+    state.publish_targets = [
+      { route: "wechat-article", account: "default" },
+      { route: "wechat-newspic", account: "ancientone" },
+    ];
+    state.metadata.title = "Test";
+    state.metadata.slug = "test";
+    state.metadata.date = "2026-06-14";
+    state.content_review.status = "passed";
+    // post.md needed by wechat-newspic provider (read before dry-run check)
+    await writeFile(join(tmpDir, "post.md"), "正文", "utf-8");
+    await writeState(statePath, state);
+
+    await publish(["--state", statePath, "--dry-run"]);
+
+    const finalState = await readState(statePath);
+    expect(finalState.publish.results).toHaveLength(2);
+    expect(finalState.publish.results[0].account).toBe("default");
+    expect(finalState.publish.results[0].status).toBe("skipped");
+    expect(finalState.publish.results[1].account).toBe("ancientone");
+    expect(finalState.publish.results[1].status).toBe("skipped");
+  });
+});
+
+describe("init with multi-target --targets", () => {
+  test("single target leaves publish_targets empty", async () => {
+    const tmpDir = await makeTempDir("zzhub-test-init-single-");
+    const output = await captureJsonOutput<any>(() =>
+      init([
+        "--workspace", tmpDir,
+        "--task-kind", "publish",
+        "--content-form", "article",
+        "--targets", "wechat-article",
+        "--content-origin", "user",
+        "--account", "default",
+      ]),
+    );
+    const state = await readState(output.state_path);
+    expect(state.publish_targets).toEqual([]);
+    expect(state.route.primary).toBe("wechat-article");
+    expect(state.route.account).toBe("default");
+  });
+
+  test("multi-target populates publish_targets", async () => {
+    const tmpDir = await makeTempDir("zzhub-test-init-multi-");
+    const output = await captureJsonOutput<any>(() =>
+      init([
+        "--workspace", tmpDir,
+        "--task-kind", "publish",
+        "--content-form", "article",
+        "--targets", "wechat-article@default,wechat-article@ancientone,blog@default",
+        "--content-origin", "user",
+      ]),
+    );
+    const state = await readState(output.state_path);
+    expect(state.publish_targets).toHaveLength(3);
+    expect(state.publish_targets[0]).toEqual({ route: "wechat-article", account: "default" });
+    expect(state.publish_targets[1]).toEqual({ route: "wechat-article", account: "ancientone" });
+    expect(state.publish_targets[2]).toEqual({ route: "blog", account: "default" });
+    expect(state.route.primary).toBe("wechat-article");
+    expect(state.route.account).toBe("default");
+  });
+
+  test("--targets without @ uses --account value", async () => {
+    const tmpDir = await makeTempDir("zzhub-test-init-no-at-");
+    const output = await captureJsonOutput<any>(() =>
+      init([
+        "--workspace", tmpDir,
+        "--task-kind", "publish",
+        "--content-form", "article",
+        "--targets", "wechat-article,blog",
+        "--content-origin", "user",
+        "--account", "ancientone",
+      ]),
+    );
+    const state = await readState(output.state_path);
+    expect(state.publish_targets).toHaveLength(2);
+    expect(state.publish_targets[0].account).toBe("ancientone");
+    expect(state.publish_targets[1].account).toBe("ancientone");
+  });
+});
+
+describe("republish command", () => {
+  test("republish adds targets and executes", async () => {
+    const tmpDir = await makeTempDir("zzhub-test-republish-");
+    const statePath = join(tmpDir, "state.json");
+    const state = defaultState();
+    state.run_id = "test-run";
+    state.workspace_root = tmpDir;
+    state.asset_path = tmpDir;
+    state.route.primary = "wechat-article";
+    state.route.account = "default";
+    state.metadata.title = "Test";
+    state.metadata.slug = "test";
+    state.metadata.date = "2026-06-14";
+    state.content_review.status = "passed";
+    state.mode = "done";
+    state.publish.results = [
+      {
+        route: "wechat-article",
+        account: "default",
+        status: "success",
+        detail: null,
+        published_at: "2026-06-14T10:00:00Z",
+        content_version: 1,
+        render_version: 1,
+      },
+    ];
+    await writeState(statePath, state);
+
+    // Republish to another account with dry-run
+    await republish(["--state", statePath, "--account", "ancientone", "--dry-run"]);
+
+    const finalState = await readState(statePath);
+    expect(finalState.publish_targets).toContainEqual({
+      route: "wechat-article",
+      account: "ancientone",
+    });
+    expect(finalState.publish.results).toHaveLength(2);
+    expect(finalState.mode).toBe("done");
+  });
+
+  test("republish skips idempotent targets", async () => {
+    const tmpDir = await makeTempDir("zzhub-test-republish-idem-");
+    const statePath = join(tmpDir, "state.json");
+    const state = defaultState();
+    state.run_id = "test-run";
+    state.workspace_root = tmpDir;
+    state.asset_path = tmpDir;
+    state.route.primary = "wechat-article";
+    state.route.account = "default";
+    state.metadata.title = "Test";
+    state.metadata.slug = "test";
+    state.metadata.date = "2026-06-14";
+    state.content_review.status = "passed";
+    state.mode = "done";
+    state.artifacts.content_version = 1;
+    state.artifacts.render_version = 1;
+    state.publish.results = [
+      {
+        route: "wechat-article",
+        account: "default",
+        status: "success",
+        detail: null,
+        published_at: "2026-06-14T10:00:00Z",
+        content_version: 1,
+        render_version: 1,
+      },
+    ];
+    await writeState(statePath, state);
+
+    // Try to republish same target - should skip
+    await republish(["--state", statePath, "--account", "default", "--dry-run"]);
+
+    const finalState = await readState(statePath);
+    // Should still have only 1 result (skipped duplicate)
+    expect(finalState.publish.results).toHaveLength(1);
+  });
+});