@zzclub/pipeline 0.4.0 → 0.5.1

package/README.md

@@ -409,7 +409,7 @@ src/
 | `review` | Update content review status |
 | `abandon` | Mark one or more tasks as abandoned |
 
-`ops` 组，7 个命令：
+`ops` 组，9 个命令：
 
 | 命令 | 说明 |
 | --- | --- |
@@ -420,6 +420,8 @@ src/
 | `config` | Read or update pipeline config |
 | `doctor` | Inspect resolved paths and provider health |
 | `hermes-metrics` | Show Hermes execution metrics per task |
+| `wx-drafts` | List or get drafts from WeChat draft box |
+| `wx-draft-delete` | Delete a draft from WeChat draft box |
 
 ## 常用命令
 
@@ -553,6 +555,31 @@ bun run src/cli.ts wechat-export --body /abs/path/body.md --account default
 bun run src/cli.ts cos-upload --file /abs/path/image.png --folder notes/note-id --alt image
 ```
 
+### 草稿箱管理
+
+```bash
+# 列出草稿（账号不传时使用 wx.defaultAccount）
+bun run src/cli.ts wx-drafts --limit 10
+
+# 获取某篇草稿的完整内容（含 HTML）
+bun run src/cli.ts wx-drafts --media-id MEDIA_ID
+
+# 删除一篇草稿
+bun run src/cli.ts wx-draft-delete --media-id MEDIA_ID
+```
+
+`--account` 参数可选，默认使用配置中的 `wx.defaultAccount`。
+
+### init 可选参数
+
+```bash
+# 更新已有草稿而非新建（配合 --existing-draft-media-id）
+bun run src/cli.ts init ... --existing-draft-media-id MEDIA_ID
+
+# 关联 Nezus note 用于发布结果回调
+bun run src/cli.ts init ... --note-id NOTE_ID
+```
+
 ## 状态文件
 
 最重要的字段是：

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zzclub/pipeline",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "type": "module",
   "bin": {
     "zzp": "./src/cli.ts",

package/src/commands/init.ts

@@ -16,7 +16,8 @@
  *     [--requires-research] \
  *     [--requires-style] \
  *     [--requires-render] \
- *     [--requires-publish]
+ *     [--requires-publish] \
+ *     [--existing-draft-media-id MEDIA_ID]
  *
  * Output: JSON state written to {workspace}/.zzhub-media/runs/{run_id}.json
  *         Prints the state path to stdout.
@@ -60,6 +61,7 @@ Options:
   --requires-style     Flag
   --requires-render    Flag
   --requires-publish   Flag
+  --existing-draft-media-id  Update existing WeChat draft instead of creating new one (optional)
 `.trim());
     return;
   }
@@ -72,6 +74,8 @@ Options:
   const accountOverride = optionalArg(parsed, "account");
   const styleHint = optionalArg(parsed, "style-hint") ?? null;
   const newspicRenderSpecFile = optionalArg(parsed, "newspic-render-spec-file");
+  const existingDraftMediaId = optionalArg(parsed, "existing-draft-media-id") ?? null;
+  const noteId = optionalArg(parsed, "note-id") ?? null;
   const config = loadConfig();
   const workspace = resolveWorkspaceRoot(optionalArg(parsed, "workspace"), config);
 
@@ -112,6 +116,8 @@ Options:
       render: flagArg(parsed, "requires-render"),
       publish: flagArg(parsed, "requires-publish"),
     },
+    existing_draft_media_id: existingDraftMediaId,
+    note_id: noteId,
   };
 
   await writeState(statePath, state);

package/src/commands/wx-draft-delete.ts

@@ -0,0 +1,36 @@
+/**
+ * wx-draft-delete — Delete a draft from WeChat draft box.
+ *
+ * Usage:
+ *   zzhub-pipeline wx-draft-delete [--account <account>] --media-id <media_id>
+ */
+
+import { optionalArg, parseArgs, requireArg } from "../args";
+import { loadConfig } from "../config";
+import { printHelp, printResult } from "../output";
+import { deleteWxDraft } from "../providers/wechat";
+
+export async function wxDraftDelete(args: string[]): Promise<void> {
+  const parsed = parseArgs(args);
+
+  if (parsed.help) {
+    printHelp(`
+Usage: zzhub-pipeline wx-draft-delete [options]
+
+Options:
+  --account    WeChat account name (defaults to wx.defaultAccount from config)
+  --media-id   Draft media_id to delete (required)
+
+Examples:
+  zzhub-pipeline wx-draft-delete --media-id MEDIA_ID
+`.trim());
+    return;
+  }
+
+  const config = loadConfig();
+  const account = optionalArg(parsed, "account") || config.wx.defaultAccount;
+  const mediaId = requireArg(parsed, "media-id", "draft media_id to delete");
+
+  const result = await deleteWxDraft({ account, mediaId, config });
+  printResult(result);
+}

package/src/commands/wx-drafts.ts

@@ -0,0 +1,47 @@
+/**
+ * wx-drafts — List or get WeChat draft box drafts.
+ *
+ * Usage:
+ *   zzhub-pipeline wx-drafts [--account <account>] [--limit 20] [--offset 0]
+ *   zzhub-pipeline wx-drafts [--account <account>] --media-id <media_id>
+ */
+
+import { optionalArg, parseArgs } from "../args";
+import { loadConfig } from "../config";
+import { printHelp, printResult } from "../output";
+import { getWxDraft, getWxDraftList } from "../providers/wechat";
+
+export async function wxDrafts(args: string[]): Promise<void> {
+  const parsed = parseArgs(args);
+
+  if (parsed.help) {
+    printHelp(`
+Usage: zzhub-pipeline wx-drafts [options]
+
+Options:
+  --account    WeChat account name (defaults to wx.defaultAccount from config)
+  --media-id   Draft media_id to fetch a single draft (optional)
+  --limit      Number of drafts to list, default 20, max 20 (optional)
+  --offset     Pagination offset, default 0 (optional)
+
+Examples:
+  zzhub-pipeline wx-drafts --limit 10
+  zzhub-pipeline wx-drafts --media-id MEDIA_ID
+`.trim());
+    return;
+  }
+
+  const config = loadConfig();
+  const account = optionalArg(parsed, "account") || config.wx.defaultAccount;
+  const mediaId = optionalArg(parsed, "media-id") ?? null;
+  const limit = optionalArg(parsed, "limit") ? Number.parseInt(optionalArg(parsed, "limit")!, 10) : undefined;
+  const offset = optionalArg(parsed, "offset") ? Number.parseInt(optionalArg(parsed, "offset")!, 10) : undefined;
+
+  if (mediaId) {
+    const result = await getWxDraft({ account, mediaId, config });
+    printResult(result);
+  } else {
+    const result = await getWxDraftList({ account, limit, offset, config });
+    printResult(result);
+  }
+}

package/src/plugins.ts

@@ -22,6 +22,8 @@ import { status } from "./commands/status";
 import { syncBlog } from "./commands/sync-blog";
 import { tasks } from "./commands/tasks";
 import { wechatExport } from "./commands/wechat-export";
+import { wxDrafts } from "./commands/wx-drafts";
+import { wxDraftDelete } from "./commands/wx-draft-delete";
 
 export interface CommandDefinition {
   name: string;
@@ -69,6 +71,8 @@ export function getCommandPlugins(): CommandPlugin[] {
         { name: "config", summary: "Read or update pipeline config", plugin: "ops", handler: configCommand },
         { name: "doctor", summary: "Inspect resolved paths and provider health", plugin: "ops", handler: doctor },
         { name: "hermes-metrics", summary: "Show Hermes execution metrics per task", plugin: "ops", handler: hermesMetrics },
+        { name: "wx-drafts", summary: "List or get drafts from WeChat draft box", plugin: "ops", handler: wxDrafts },
+        { name: "wx-draft-delete", summary: "Delete a draft from WeChat draft box", plugin: "ops", handler: wxDraftDelete },
       ],
     },
   ];

package/src/providers/index.ts

@@ -80,6 +80,10 @@ async function publishWechatArticleRoute({
       html,
       photos,
       config,
+      existingDraftMediaId: state.intent.existing_draft_media_id,
+      noteId: state.intent.note_id,
+      nezusBaseUrl: process.env.ZZHUB_WX_BASE_URL || config.wx.baseUrl,
+      nezusPat: process.env.ZZCLUB_PAT || config.wx.accounts[state.route.account]?.pat || config.wx.accounts[config.wx.defaultAccount]?.pat,
     });
   } catch (error) {
     return {
@@ -145,6 +149,10 @@ async function publishWechatNewspicRoute({
       content: cleanContent,
       photos,
       config,
+      existingDraftMediaId: state.intent.existing_draft_media_id,
+      noteId: state.intent.note_id,
+      nezusBaseUrl: process.env.ZZHUB_WX_BASE_URL || config.wx.baseUrl,
+      nezusPat: process.env.ZZCLUB_PAT || config.wx.accounts[state.route.account]?.pat || config.wx.accounts[config.wx.defaultAccount]?.pat,
     });
   } catch (error) {
     return {

package/src/providers/wechat.ts

@@ -4,7 +4,11 @@ import { PipelineConfig, WxAccountConfig } from "../config";
 
 const TOKEN_PATH = "/api/v1/wx/cgi-bin/token";
 const MATERIAL_PATH = "/api/v1/wx/cgi-bin/material/add_material";
-const DRAFT_PATH = "/api/v1/wx/cgi-bin/draft/add";
+const DRAFT_ADD_PATH = "/api/v1/wx/cgi-bin/draft/add";
+const DRAFT_UPDATE_PATH = "/api/v1/wx/cgi-bin/draft/update";
+const DRAFT_GET_PATH = "/api/v1/wx/cgi-bin/draft/get";
+const DRAFT_DELETE_PATH = "/api/v1/wx/cgi-bin/draft/delete";
+const BATCH_GET_PATH = "/api/v1/wx/cgi-bin/draft/batchget";
 const TOKEN_TIMEOUT = 10000;
 const UPLOAD_TIMEOUT = 60000;
 const DRAFT_TIMEOUT = 30000;
@@ -78,14 +82,19 @@ interface BaseWechatPublishInput {
   photos?: string[];
   timeout?: number;
   config: PipelineConfig;
+  noteId?: string | null;
+  nezusBaseUrl?: string | null;
+  nezusPat?: string | null;
 }
 
 export interface WechatDraftInput extends BaseWechatPublishInput {
   html: string;
+  existingDraftMediaId?: string | null;
 }
 
 export interface WechatNewspicInput extends BaseWechatPublishInput {
   content: string;
+  existingDraftMediaId?: string | null;
 }
 
 function requireValue(name: string, value: string | undefined): string {
@@ -459,15 +468,21 @@ export async function createWechatDraft(input: WechatDraftInput): Promise<Record
   const uploadResult = await uploadPhotos(runtime, accessToken, finalPhotos, uploadTimeout);
   const replacedHtml = replaceImageUrls(input.html, uploadResult.imageUrlMap);
 
-  const response = await requestJson(
-    `${runtime.baseUrl}${DRAFT_PATH}`,
-    {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${runtime.pat}`,
-      },
-      body: {
+  const isUpdate = !!input.existingDraftMediaId;
+  const draftPath = isUpdate ? DRAFT_UPDATE_PATH : DRAFT_ADD_PATH;
+  const draftBody = isUpdate
+    ? {
+        access_token: accessToken,
+        media_id: input.existingDraftMediaId,
+        index: 0,
+        articles: {
+          article_type: "news",
+          title: input.title,
+          content: replacedHtml,
+          thumb_media_id: uploadResult.coverMediaId,
+        },
+      }
+    : {
         access_token: accessToken,
         articles: [
           {
@@ -477,11 +492,34 @@ export async function createWechatDraft(input: WechatDraftInput): Promise<Record
             thumb_media_id: uploadResult.coverMediaId,
           },
         ],
+      };
+
+  const response = await requestJson(
+    `${runtime.baseUrl}${draftPath}`,
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${runtime.pat}`,
       },
+      body: draftBody,
     },
     draftTimeout,
   );
 
+  const draftMediaId = isUpdate ? input.existingDraftMediaId : (response as any)?.data?.media_id || (response as any)?.media_id || null;
+
+  // ── Callback to Nezus to persist media_id ──
+  if (draftMediaId && input.noteId && input.nezusBaseUrl && input.nezusPat) {
+    await notifyNezusPublishResult({
+      nezusBaseUrl: input.nezusBaseUrl,
+      nezusPat: input.nezusPat,
+      noteId: input.noteId,
+      wechatMediaId: draftMediaId,
+      publishType: "article",
+    });
+  }
+
   return {
     account: runtime.accountName,
     articleType: "news",
@@ -489,6 +527,8 @@ export async function createWechatDraft(input: WechatDraftInput): Promise<Record
     photosCount: finalPhotos.length,
     totalUploaded: uploadResult.totalUploaded,
     coverMediaId: uploadResult.coverMediaId,
+    isUpdate,
+    draftMediaId,
     response,
   };
 }
@@ -512,15 +552,22 @@ export async function createWechatNewspic(input: WechatNewspicInput): Promise<Re
     image_list: uploadResult.uploadedMedia.map((item) => ({ image_media_id: item.mediaId })),
   };
 
-  const response = await requestJson(
-    `${runtime.baseUrl}${DRAFT_PATH}`,
-    {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${runtime.pat}`,
-      },
-      body: {
+  const isUpdate = !!input.existingDraftMediaId;
+  const draftPath = isUpdate ? DRAFT_UPDATE_PATH : DRAFT_ADD_PATH;
+  const draftBody = isUpdate
+    ? {
+        access_token: accessToken,
+        media_id: input.existingDraftMediaId,
+        index: 0,
+        articles: {
+          article_type: "newspic",
+          title: input.title,
+          content: input.content,
+          thumb_media_id: uploadResult.coverMediaId,
+          image_info: imageInfo,
+        },
+      }
+    : {
         access_token: accessToken,
         articles: [
           {
@@ -531,11 +578,34 @@ export async function createWechatNewspic(input: WechatNewspicInput): Promise<Re
             image_info: imageInfo,
           },
         ],
+      };
+
+  const response = await requestJson(
+    `${runtime.baseUrl}${draftPath}`,
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${runtime.pat}`,
       },
+      body: draftBody,
     },
     draftTimeout,
   );
 
+  const draftMediaId = isUpdate ? input.existingDraftMediaId : (response as any)?.data?.media_id || (response as any)?.media_id || null;
+
+  // ── Callback to Nezus to persist media_id ──
+  if (draftMediaId && input.noteId && input.nezusBaseUrl && input.nezusPat) {
+    await notifyNezusPublishResult({
+      nezusBaseUrl: input.nezusBaseUrl,
+      nezusPat: input.nezusPat,
+      noteId: input.noteId,
+      wechatMediaId: draftMediaId,
+      publishType: "newspic",
+    });
+  }
+
   return {
     account: runtime.accountName,
     articleType: "newspic",
@@ -543,6 +613,146 @@ export async function createWechatNewspic(input: WechatNewspicInput): Promise<Re
     photosCount: finalPhotos.length,
     totalUploaded: uploadResult.totalUploaded,
     coverMediaId: uploadResult.coverMediaId,
+    isUpdate,
+    draftMediaId,
+    response,
+  };
+}
+
+// ── Nezus callback ────────────────────────────────────────────────
+
+async function notifyNezusPublishResult(params: {
+  nezusBaseUrl: string;
+  nezusPat: string;
+  noteId: string;
+  wechatMediaId: string;
+  publishType: string;
+}): Promise<void> {
+  try {
+    await requestJson(
+      `${params.nezusBaseUrl}/api/v1/notes/${params.noteId}/publish-result`,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${params.nezusPat}`,
+        },
+        body: {
+          wechatMediaId: params.wechatMediaId,
+          publishType: params.publishType,
+        },
+      },
+      10000,
+    );
+    console.error(`[nezus] publish-result callback OK for note ${params.noteId}`);
+  } catch (err) {
+    // Non-fatal: the draft was created successfully even if the callback failed
+    console.error(`[nezus] publish-result callback failed for note ${params.noteId}:`, err);
+  }
+}
+
+// ── Draft management ──────────────────────────────────────────────
+
+export interface WxDraftListInput {
+  account?: string;
+  limit?: number;
+  offset?: number;
+  config: PipelineConfig;
+}
+
+export interface WxDraftGetInput {
+  account?: string;
+  mediaId: string;
+  config: PipelineConfig;
+}
+
+export interface WxDraftDeleteInput {
+  account?: string;
+  mediaId: string;
+  config: PipelineConfig;
+}
+
+export async function getWxDraftList(input: WxDraftListInput): Promise<Record<string, unknown>> {
+  const runtime = getWxRuntimeConfig(input.config, input.account);
+  const tokenTimeout = resolveTimeout(TOKEN_TIMEOUT, runtime.timeout);
+  const accessToken = await fetchAccessToken(runtime, tokenTimeout);
+
+  const response = await requestJson(
+    `${runtime.baseUrl}${BATCH_GET_PATH}`,
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${runtime.pat}`,
+      },
+      body: {
+        access_token: accessToken,
+        offset: input.offset ?? 0,
+        count: input.limit ?? 20,
+        no_content: true,
+      },
+    },
+    resolveTimeout(30000, runtime.timeout),
+  );
+
+  return {
+    account: runtime.accountName,
+    response,
+  };
+}
+
+export async function getWxDraft(input: WxDraftGetInput): Promise<Record<string, unknown>> {
+  const runtime = getWxRuntimeConfig(input.config, input.account);
+  const tokenTimeout = resolveTimeout(TOKEN_TIMEOUT, runtime.timeout);
+  const accessToken = await fetchAccessToken(runtime, tokenTimeout);
+
+  const response = await requestJson(
+    `${runtime.baseUrl}${DRAFT_GET_PATH}`,
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${runtime.pat}`,
+      },
+      body: {
+        access_token: accessToken,
+        media_id: input.mediaId,
+      },
+    },
+    resolveTimeout(30000, runtime.timeout),
+  );
+
+  return {
+    account: runtime.accountName,
+    mediaId: input.mediaId,
+    response,
+  };
+}
+
+export async function deleteWxDraft(input: WxDraftDeleteInput): Promise<Record<string, unknown>> {
+  const runtime = getWxRuntimeConfig(input.config, input.account);
+  const tokenTimeout = resolveTimeout(TOKEN_TIMEOUT, runtime.timeout);
+  const accessToken = await fetchAccessToken(runtime, tokenTimeout);
+
+  const response = await requestJson(
+    `${runtime.baseUrl}${DRAFT_DELETE_PATH}`,
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${runtime.pat}`,
+      },
+      body: {
+        access_token: accessToken,
+        media_id: input.mediaId,
+      },
+    },
+    resolveTimeout(30000, runtime.timeout),
+  );
+
+  return {
+    account: runtime.accountName,
+    mediaId: input.mediaId,
     response,
   };
 }

package/src/schema/state.ts

@@ -303,6 +303,8 @@ const IntentSchema = withObjectDefault(
     style_hint: z.string().nullable().default(null),
     newspic_render: NewspicRenderSpecSchema.nullable().default(null),
     requires: IntentRequiresSchema,
+    existing_draft_media_id: z.string().nullable().default(null),
+    note_id: z.string().nullable().default(null),
   }),
 );