chore: release v1.79.1

Merge the three plugins (content-skills, ai-generation-skills,
utility-skills) into one plugin entry. Since all three shared the same
source ("./"), Claude Code cached every skill three times. A single
plugin with one source keeps the flat skills/ layout while ensuring
each skill is registered exactly once.

.claude-plugin/marketplace.json

@@ -6,48 +6,32 @@
   },
   "metadata": {
     "description": "Skills shared by Baoyu for improving daily work efficiency",
-    "version": "1.78.0"
+    "version": "1.79.1"
   },
   "plugins": [
     {
-      "name": "content-skills",
+      "name": "baoyu-skills",
-      "description": "Content generation and publishing skills",
+      "description": "Content generation, AI backends, and utility tools for daily work efficiency",
       "source": "./",
       "strict": true,
       "skills": [
-        "./skills/baoyu-xhs-images",
-        "./skills/baoyu-post-to-x",
-        "./skills/baoyu-post-to-wechat",
-        "./skills/baoyu-post-to-weibo",
         "./skills/baoyu-article-illustrator",
-        "./skills/baoyu-cover-image",
-        "./skills/baoyu-slide-deck",
         "./skills/baoyu-comic",
-        "./skills/baoyu-infographic"
-      ]
-    },
-    {
-      "name": "ai-generation-skills",
-      "description": "AI-powered generation backends",
-      "source": "./",
-      "strict": true,
-      "skills": [
-        "./skills/baoyu-danger-gemini-web",
-        "./skills/baoyu-image-gen"
-      ]
-    },
-    {
-      "name": "utility-skills",
-      "description": "Utility tools for content processing",
-      "source": "./",
-      "strict": true,
-      "skills": [
-        "./skills/baoyu-danger-x-to-markdown",
         "./skills/baoyu-compress-image",
-        "./skills/baoyu-url-to-markdown",
+        "./skills/baoyu-cover-image",
+        "./skills/baoyu-danger-gemini-web",
+        "./skills/baoyu-danger-x-to-markdown",
         "./skills/baoyu-format-markdown",
+        "./skills/baoyu-image-gen",
+        "./skills/baoyu-infographic",
         "./skills/baoyu-markdown-to-html",
+        "./skills/baoyu-post-to-weibo",
+        "./skills/baoyu-post-to-wechat",
+        "./skills/baoyu-post-to-x",
+        "./skills/baoyu-slide-deck",
         "./skills/baoyu-translate",
+        "./skills/baoyu-url-to-markdown",
+        "./skills/baoyu-xhs-images",
         "./skills/baoyu-youtube-transcript"
       ]
     }

CHANGELOG.md

@@ -2,6 +2,22 @@
 
 English | [中文](./CHANGELOG.zh.md)
 
+## 1.79.1 - 2026-03-23
+
+### Fixes
+- Consolidate to single plugin to prevent duplicate skill registration (by @TyrealQ)
+- `baoyu-article-illustrator`: remove opacity parameter from watermark prompt
+- `baoyu-comic`: fix Doraemon naming spacing and remove opacity from watermark prompt
+- `baoyu-xhs-images`: remove opacity from watermark prompt and fix CJK spacing
+
+### Documentation
+- Update project documentation to reflect single-plugin architecture
+
+## 1.79.0 - 2026-03-22
+
+### Features
+- `baoyu-post-to-wechat`: improve credential loading with multi-source resolution, priority ordering, and diagnostics for skipped incomplete sources
+
 ## 1.78.0 - 2026-03-22
 
 ### Features

CHANGELOG.zh.md

@@ -2,6 +2,22 @@
 
 [English](./CHANGELOG.md) | 中文
 
+## 1.79.1 - 2026-03-23
+
+### 修复
+- 合并为单一插件，防止 skill 重复注册 (by @TyrealQ)
+- `baoyu-article-illustrator`：移除水印提示词中的不透明度参数
+- `baoyu-comic`：修正哆啦 A 梦命名间距，移除水印不透明度参数
+- `baoyu-xhs-images`：移除水印不透明度参数，修正中英文间距
+
+### 文档
+- 更新项目文档以反映单一插件架构
+
+## 1.79.0 - 2026-03-22
+
+### 新功能
+- `baoyu-post-to-wechat`：改进凭据加载机制，支持多来源优先级解析，并提供不完整凭据来源的诊断信息
+
 ## 1.78.0 - 2026-03-22
 
 ### 新功能

CLAUDE.md

@@ -1,16 +1,16 @@
 # CLAUDE.md
 
-Claude Code marketplace plugin providing AI-powered content generation skills. Version: **1.78.0**.
+Claude Code marketplace plugin providing AI-powered content generation skills. Version: **1.79.1**.
 
 ## Architecture
 
-Skills organized into three categories in `.claude-plugin/marketplace.json` (defines plugin metadata, version, and skill paths):
+Skills are exposed through the single `baoyu-skills` plugin in `.claude-plugin/marketplace.json` (which defines plugin metadata, version, and skill paths). The repo docs still group them into three logical areas:
 
-| Category | Description |
+| Group | Description |
-|----------|-------------|
+|-------|-------------|
-| `content-skills` | Generate or publish content (images, slides, comics, posts) |
+| Content Skills | Generate or publish content (images, slides, comics, posts) |
-| `ai-generation-skills` | AI generation backends |
+| AI Generation Skills | AI generation backends |
-| `utility-skills` | Content processing (conversion, compression, translation) |
+| Utility Skills | Content processing (conversion, compression, translation) |
 
 Each skill contains `SKILL.md` (YAML front matter + docs), optional `scripts/`, `references/`, `prompts/`.
 

README.md

@@ -52,16 +52,14 @@ Run the following command in Claude Code:
 
 1. Select **Browse and install plugins**
 2. Select **baoyu-skills**
-3. Select the plugin(s) you want to install
+3. Select the **baoyu-skills** plugin
 4. Select **Install now**
 
 **Option 2: Direct Install**
 
 ```bash
-# Install specific plugin
+# Install the marketplace's single plugin
-/plugin install content-skills@baoyu-skills
+/plugin install baoyu-skills@baoyu-skills
-/plugin install ai-generation-skills@baoyu-skills
-/plugin install utility-skills@baoyu-skills
 ```
 
 **Option 3: Ask the Agent**
@@ -70,13 +68,13 @@ Simply tell Claude Code:
 
 > Please install Skills from github.com/JimLiu/baoyu-skills
 
-### Available Plugins
+### Available Plugin
 
-| Plugin | Description | Skills |
+The marketplace now exposes a single plugin so each skill is registered exactly once.
-|--------|-------------|--------|
+
-| **content-skills** | Content generation and publishing | [xhs-images](#baoyu-xhs-images), [infographic](#baoyu-infographic), [cover-image](#baoyu-cover-image), [slide-deck](#baoyu-slide-deck), [comic](#baoyu-comic), [article-illustrator](#baoyu-article-illustrator), [post-to-x](#baoyu-post-to-x), [post-to-wechat](#baoyu-post-to-wechat), [post-to-weibo](#baoyu-post-to-weibo) |
+| Plugin | Description | Includes |
-| **ai-generation-skills** | AI-powered generation backends | [image-gen](#baoyu-image-gen), [danger-gemini-web](#baoyu-danger-gemini-web) |
+|--------|-------------|----------|
-| **utility-skills** | Utility tools for content processing | [youtube-transcript](#baoyu-youtube-transcript), [url-to-markdown](#baoyu-url-to-markdown), [danger-x-to-markdown](#baoyu-danger-x-to-markdown), [compress-image](#baoyu-compress-image), [format-markdown](#baoyu-format-markdown), [markdown-to-html](#baoyu-markdown-to-html), [translate](#baoyu-translate) |
+| **baoyu-skills** | Content generation, AI backends, and utility tools for daily work efficiency | All skills in this repository, organized below as Content Skills, AI Generation Skills, and Utility Skills |
 
 ## Update Skills
 

README.zh.md

@@ -52,16 +52,14 @@ clawhub install baoyu-markdown-to-html
 
 1. 选择 **Browse and install plugins**
 2. 选择 **baoyu-skills**
-3. 选择要安装的插件
+3. 选择 **baoyu-skills** 插件
 4. 选择 **Install now**
 
 **方式二：直接安装**
 
 ```bash
-# 安装指定插件
+# 安装 marketplace 中唯一的插件
-/plugin install content-skills@baoyu-skills
+/plugin install baoyu-skills@baoyu-skills
-/plugin install ai-generation-skills@baoyu-skills
-/plugin install utility-skills@baoyu-skills
 ```
 
 **方式三：告诉 Agent**
@@ -72,11 +70,11 @@ clawhub install baoyu-markdown-to-html
 
 ### 可用插件
 
-| 插件 | 说明 | 包含技能 |
+现在 marketplace 只暴露一个插件，这样每个 skill 只会注册一次。
+
+| 插件 | 说明 | 包含内容 |
 |------|------|----------|
-| **content-skills** | 内容生成和发布 | [xhs-images](#baoyu-xhs-images), [infographic](#baoyu-infographic), [cover-image](#baoyu-cover-image), [slide-deck](#baoyu-slide-deck), [comic](#baoyu-comic), [article-illustrator](#baoyu-article-illustrator), [post-to-x](#baoyu-post-to-x), [post-to-wechat](#baoyu-post-to-wechat), [post-to-weibo](#baoyu-post-to-weibo) |
+| **baoyu-skills** | 提供内容生成、AI 后端和日常效率工具技能 | 仓库中的全部 skills，仍按下方的内容技能、AI 生成技能、工具技能三个分类展示 |
-| **ai-generation-skills** | AI 生成后端 | [image-gen](#baoyu-image-gen), [danger-gemini-web](#baoyu-danger-gemini-web) |
-| **utility-skills** | 内容处理工具 | [youtube-transcript](#baoyu-youtube-transcript), [url-to-markdown](#baoyu-url-to-markdown), [danger-x-to-markdown](#baoyu-danger-x-to-markdown), [compress-image](#baoyu-compress-image), [format-markdown](#baoyu-format-markdown), [markdown-to-html](#baoyu-markdown-to-html), [translate](#baoyu-translate) |
 
 ## 更新技能
 

docs/creating-skills.md

@@ -34,20 +34,22 @@ metadata:
 1. Create `skills/baoyu-<name>/SKILL.md` with YAML front matter
 2. Add TypeScript in `skills/baoyu-<name>/scripts/` (if applicable)
 3. Add prompt templates in `skills/baoyu-<name>/prompts/` if needed
-4. Register in `marketplace.json` under appropriate category
+4. Register the skill in `.claude-plugin/marketplace.json` under the `baoyu-skills` plugin entry
 5. Add Script Directory section to SKILL.md if skill has scripts
 6. Add openclaw metadata to frontmatter
 
-## Category Selection
+## Skill Grouping
 
-| If your skill... | Use category |
+All skills are registered under the single `baoyu-skills` plugin. Use these logical groups when deciding where the skill should appear in the docs:
-|------------------|--------------|
-| Generates visual content (images, slides, comics) | `content-skills` |
-| Publishes to platforms (X, WeChat, Weibo) | `content-skills` |
-| Provides AI generation backend | `ai-generation-skills` |
-| Converts or processes content | `utility-skills` |
 
-New category: add plugin object to `marketplace.json` with `name`, `description`, `skills[]`.
+| If your skill... | Use group |
+|------------------|-----------|
+| Generates visual content (images, slides, comics) | Content Skills |
+| Publishes to platforms (X, WeChat, Weibo) | Content Skills |
+| Provides AI generation backend | AI Generation Skills |
+| Converts or processes content | Utility Skills |
+
+If you add a new logical group, update the docs that present grouped skills, but keep the skill registered under the single `baoyu-skills` plugin entry.
 
 ## Writing Descriptions
 

skills/baoyu-article-illustrator/references/prompt-construction.md

@@ -280,5 +280,5 @@ TEXTURE: Halftone transitions between sides
 If watermark enabled in preferences, append:
 
 ```
-Include a subtle watermark "[content]" positioned at [position] with approximately [opacity*100]% visibility.
+Include a subtle watermark "[content]" positioned at [position].
 ```

skills/baoyu-comic/references/workflow.md

@@ -278,7 +278,7 @@ Create storyboard and character definitions using the confirmed style from Step
 | Role | Character | Visual Description |
 |------|-----------|-------------------|
 | Student | 大雄 (Nobita) | Japanese boy, 10yo, round glasses, black hair parted in middle, yellow shirt, navy shorts |
-| Mentor | 哆啦A梦 (Doraemon) | Round blue robot cat, big white eyes, red nose, whiskers, white belly with 4D pocket, golden bell, no ears |
+| Mentor | 哆啦 A 梦 (Doraemon) | Round blue robot cat, big white eyes, red nose, whiskers, white belly with 4D pocket, golden bell, no ears |
 | Challenge | 胖虎 (Gian) | Stocky boy, rough features, small eyes, orange shirt |
 | Support | 静香 (Shizuka) | Cute girl, black short hair, pink dress, gentle expression |
 
@@ -359,8 +359,7 @@ Art: [art style] | Tone: [tone] | Layout: [layout type]
 **Watermark Application** (if enabled in preferences):
 Add to each prompt:
 ```
-Include a subtle watermark "[content]" positioned at [position]
+Include a subtle watermark "[content]" positioned at [position]. The watermark should
-with approximately [opacity*100]% visibility. The watermark should
 be legible but not distracting from the comic panels and storytelling.
 Ensure watermark does not overlap speech bubbles or key action.
 ```
@@ -452,8 +451,8 @@ When skill does NOT support reference images, create combined prompt files:
 
 ## Character Reference (maintain consistency)
 [Copy relevant sections from characters/characters.md here]
-- 大雄: Japanese boy, round glasses, yellow shirt, navy shorts...
+- 大雄：Japanese boy, round glasses, yellow shirt, navy shorts...
-- 哆啦A梦: Round blue robot cat, white belly, red nose, golden bell...
+- 哆啦 A 梦：Round blue robot cat, white belly, red nose, golden bell...
 
 ## Page Content
 [Original page prompt here]

skills/baoyu-post-to-wechat/scripts/wechat-api.ts

@@ -694,6 +694,10 @@ async function main(): Promise<void> {
   }
 
   const creds = loadCredentials(resolved);
+  for (const skippedSource of creds.skippedSources) {
+    console.error(`[wechat-api] Skipped incomplete credential source: ${skippedSource}`);
+  }
+  console.error(`[wechat-api] Credentials source: ${creds.source}`);
   console.error("[wechat-api] Fetching access token...");
   const accessToken = await fetchAccessToken(creds.appId, creds.appSecret);
 

skills/baoyu-post-to-wechat/scripts/wechat-extend-config.test.ts

@@ -0,0 +1,139 @@
+import assert from "node:assert/strict";
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import process from "node:process";
+import test, { type TestContext } from "node:test";
+
+import { loadCredentials } from "./wechat-extend-config.ts";
+
+function useCwd(t: TestContext, cwd: string): void {
+  const previous = process.cwd();
+  process.chdir(cwd);
+  t.after(() => {
+    process.chdir(previous);
+  });
+}
+
+function useHome(t: TestContext, home: string): void {
+  const previous = process.env.HOME;
+  process.env.HOME = home;
+  t.after(() => {
+    if (previous === undefined) {
+      delete process.env.HOME;
+      return;
+    }
+    process.env.HOME = previous;
+  });
+}
+
+function useWechatEnv(
+  t: TestContext,
+  values: Partial<Record<"WECHAT_APP_ID" | "WECHAT_APP_SECRET", string | undefined>>,
+): void {
+  const previous = {
+    WECHAT_APP_ID: process.env.WECHAT_APP_ID,
+    WECHAT_APP_SECRET: process.env.WECHAT_APP_SECRET,
+  };
+
+  if (values.WECHAT_APP_ID === undefined) {
+    delete process.env.WECHAT_APP_ID;
+  } else {
+    process.env.WECHAT_APP_ID = values.WECHAT_APP_ID;
+  }
+
+  if (values.WECHAT_APP_SECRET === undefined) {
+    delete process.env.WECHAT_APP_SECRET;
+  } else {
+    process.env.WECHAT_APP_SECRET = values.WECHAT_APP_SECRET;
+  }
+
+  t.after(() => {
+    if (previous.WECHAT_APP_ID === undefined) {
+      delete process.env.WECHAT_APP_ID;
+    } else {
+      process.env.WECHAT_APP_ID = previous.WECHAT_APP_ID;
+    }
+
+    if (previous.WECHAT_APP_SECRET === undefined) {
+      delete process.env.WECHAT_APP_SECRET;
+    } else {
+      process.env.WECHAT_APP_SECRET = previous.WECHAT_APP_SECRET;
+    }
+  });
+}
+
+async function makeTempDir(prefix: string): Promise<string> {
+  return fs.mkdtemp(path.join(os.tmpdir(), prefix));
+}
+
+async function writeEnvFile(root: string, content: string): Promise<void> {
+  const envPath = path.join(root, ".baoyu-skills", ".env");
+  await fs.mkdir(path.dirname(envPath), { recursive: true });
+  await fs.writeFile(envPath, content);
+}
+
+test("loadCredentials selects the first complete source without mixing values across sources", async (t) => {
+  const cwdRoot = await makeTempDir("wechat-creds-cwd-");
+  const homeRoot = await makeTempDir("wechat-creds-home-");
+
+  useCwd(t, cwdRoot);
+  useHome(t, homeRoot);
+  useWechatEnv(t, {
+    WECHAT_APP_ID: undefined,
+    WECHAT_APP_SECRET: "stale-secret-from-process-env",
+  });
+
+  await writeEnvFile(cwdRoot, "WECHAT_APP_ID=cwd-app-id\nWECHAT_APP_SECRET=cwd-app-secret\n");
+  await writeEnvFile(homeRoot, "WECHAT_APP_ID=home-app-id\nWECHAT_APP_SECRET=home-app-secret\n");
+
+  const credentials = loadCredentials();
+
+  assert.equal(credentials.appId, "cwd-app-id");
+  assert.equal(credentials.appSecret, "cwd-app-secret");
+  assert.equal(credentials.source, "<cwd>/.baoyu-skills/.env");
+  assert.deepEqual(credentials.skippedSources, [
+    "process.env missing WECHAT_APP_ID",
+  ]);
+});
+
+test("loadCredentials prefers a complete process.env pair over lower-priority files", async (t) => {
+  const cwdRoot = await makeTempDir("wechat-creds-cwd-");
+  const homeRoot = await makeTempDir("wechat-creds-home-");
+
+  useCwd(t, cwdRoot);
+  useHome(t, homeRoot);
+  useWechatEnv(t, {
+    WECHAT_APP_ID: "env-app-id",
+    WECHAT_APP_SECRET: "env-app-secret",
+  });
+
+  await writeEnvFile(cwdRoot, "WECHAT_APP_ID=cwd-app-id\nWECHAT_APP_SECRET=cwd-app-secret\n");
+  await writeEnvFile(homeRoot, "WECHAT_APP_ID=home-app-id\nWECHAT_APP_SECRET=home-app-secret\n");
+
+  const credentials = loadCredentials();
+
+  assert.equal(credentials.appId, "env-app-id");
+  assert.equal(credentials.appSecret, "env-app-secret");
+  assert.equal(credentials.source, "process.env");
+  assert.deepEqual(credentials.skippedSources, []);
+});
+
+test("loadCredentials reports skipped incomplete sources when no complete pair exists", async (t) => {
+  const cwdRoot = await makeTempDir("wechat-creds-cwd-");
+  const homeRoot = await makeTempDir("wechat-creds-home-");
+
+  useCwd(t, cwdRoot);
+  useHome(t, homeRoot);
+  useWechatEnv(t, {
+    WECHAT_APP_ID: "env-app-id",
+    WECHAT_APP_SECRET: undefined,
+  });
+
+  await writeEnvFile(cwdRoot, "WECHAT_APP_SECRET=cwd-app-secret\n");
+
+  assert.throws(
+    () => loadCredentials(),
+    /Incomplete credential sources skipped:\n- process\.env missing WECHAT_APP_SECRET\n- <cwd>\/\.baoyu-skills\/\.env missing WECHAT_APP_ID/,
+  );
+});

skills/baoyu-post-to-wechat/scripts/wechat-extend-config.ts

@@ -196,48 +196,116 @@ function aliasToEnvKey(alias: string): string {
   return alias.toUpperCase().replace(/-/g, "_");
 }
 
-export function loadCredentials(account?: ResolvedAccount): { appId: string; appSecret: string } {
+interface CredentialSource {
-  if (account?.app_id && account?.app_secret) {
+  name: string;
-    return { appId: account.app_id, appSecret: account.app_secret };
+  appIdKey: string;
+  appSecretKey: string;
+  appId?: string;
+  appSecret?: string;
+}
+
+export interface LoadedCredentials {
+  appId: string;
+  appSecret: string;
+  source: string;
+  skippedSources: string[];
+}
+
+function normalizeCredentialValue(value?: string): string | undefined {
+  const trimmed = value?.trim();
+  return trimmed ? trimmed : undefined;
+}
+
+function describeMissingKeys(source: CredentialSource): string {
+  const missingKeys: string[] = [];
+  if (!source.appId) missingKeys.push(source.appIdKey);
+  if (!source.appSecret) missingKeys.push(source.appSecretKey);
+  return `${source.name} missing ${missingKeys.join(" and ")}`;
+}
+
+function buildCredentialSource(
+  name: string,
+  values: Record<string, string | undefined>,
+  appIdKey: string,
+  appSecretKey: string,
+): CredentialSource {
+  return {
+    name,
+    appIdKey,
+    appSecretKey,
+    appId: normalizeCredentialValue(values[appIdKey]),
+    appSecret: normalizeCredentialValue(values[appSecretKey]),
+  };
+}
+
+function resolveCredentialSource(
+  sources: CredentialSource[],
+  account?: ResolvedAccount,
+): LoadedCredentials {
+  const skippedSources: string[] = [];
+
+  for (const source of sources) {
+    if (source.appId && source.appSecret) {
+      return {
+        appId: source.appId,
+        appSecret: source.appSecret,
+        source: source.name,
+        skippedSources,
+      };
+    }
+
+    if (source.appId || source.appSecret) {
+      skippedSources.push(describeMissingKeys(source));
+    }
   }
 
+  const hint = account?.alias ? ` (account: ${account.alias})` : "";
+  const partialHint = skippedSources.length > 0
+    ? `\nIncomplete credential sources skipped:\n- ${skippedSources.join("\n- ")}`
+    : "";
+
+  throw new Error(
+    `Missing WECHAT_APP_ID or WECHAT_APP_SECRET${hint}.\n` +
+    "Set via EXTEND.md account config, environment variables, or .baoyu-skills/.env file." +
+    partialHint
+  );
+}
+
+export function loadCredentials(account?: ResolvedAccount): LoadedCredentials {
   const cwdEnvPath = path.join(process.cwd(), ".baoyu-skills", ".env");
   const homeEnvPath = path.join(os.homedir(), ".baoyu-skills", ".env");
   const cwdEnv = loadEnvFile(cwdEnvPath);
   const homeEnv = loadEnvFile(homeEnvPath);
 
+  const sources: CredentialSource[] = [];
+
+  if (account?.app_id || account?.app_secret) {
+    sources.push({
+      name: account.alias ? `EXTEND.md account "${account.alias}"` : "EXTEND.md account config",
+      appIdKey: "app_id",
+      appSecretKey: "app_secret",
+      appId: normalizeCredentialValue(account.app_id),
+      appSecret: normalizeCredentialValue(account.app_secret),
+    });
+  }
+
   const prefix = account?.alias ? `WECHAT_${aliasToEnvKey(account.alias)}_` : "";
-
-  let appId = "";
-  let appSecret = "";
-
   if (prefix) {
-    appId = process.env[`${prefix}APP_ID`]
+    const prefixedKeyLabel = `${prefix}APP_ID/${prefix}APP_SECRET`;
-      || cwdEnv[`${prefix}APP_ID`]
+    sources.push(
-      || homeEnv[`${prefix}APP_ID`]
+      buildCredentialSource(`process.env (${prefixedKeyLabel})`, process.env, `${prefix}APP_ID`, `${prefix}APP_SECRET`),
-      || "";
+      buildCredentialSource(`<cwd>/.baoyu-skills/.env (${prefixedKeyLabel})`, cwdEnv, `${prefix}APP_ID`, `${prefix}APP_SECRET`),
-    appSecret = process.env[`${prefix}APP_SECRET`]
+      buildCredentialSource(`~/.baoyu-skills/.env (${prefixedKeyLabel})`, homeEnv, `${prefix}APP_ID`, `${prefix}APP_SECRET`),
-      || cwdEnv[`${prefix}APP_SECRET`]
-      || homeEnv[`${prefix}APP_SECRET`]
-      || "";
-  }
-
-  if (!appId) {
-    appId = process.env.WECHAT_APP_ID || cwdEnv.WECHAT_APP_ID || homeEnv.WECHAT_APP_ID || "";
-  }
-  if (!appSecret) {
-    appSecret = process.env.WECHAT_APP_SECRET || cwdEnv.WECHAT_APP_SECRET || homeEnv.WECHAT_APP_SECRET || "";
-  }
-
-  if (!appId || !appSecret) {
-    const hint = account?.alias ? ` (account: ${account.alias})` : "";
-    throw new Error(
-      `Missing WECHAT_APP_ID or WECHAT_APP_SECRET${hint}.\n` +
-      "Set via EXTEND.md account config, environment variables, or .baoyu-skills/.env file."
     );
   }
 
-  return { appId, appSecret };
+  sources.push(
+    buildCredentialSource("process.env", process.env, "WECHAT_APP_ID", "WECHAT_APP_SECRET"),
+    buildCredentialSource("<cwd>/.baoyu-skills/.env", cwdEnv, "WECHAT_APP_ID", "WECHAT_APP_SECRET"),
+    buildCredentialSource("~/.baoyu-skills/.env", homeEnv, "WECHAT_APP_ID", "WECHAT_APP_SECRET"),
+  );
+
+  return resolveCredentialSource(sources, account);
 }
 
 export function listAccounts(config: WechatExtendConfig): string[] {

skills/baoyu-xhs-images/references/workflows/prompt-assembly.md

@@ -151,8 +151,7 @@ From outline entry:
 ```markdown
 ## Watermark
 
-Include a subtle watermark "{content}" positioned at {position}
+Include a subtle watermark "{content}" positioned at {position}. The watermark should
-with approximately {opacity*100}% visibility. The watermark should
 be legible but not distracting from the main content.
 ```
 
@@ -295,19 +294,19 @@ Create a Xiaohongshu (Little Red Book) style infographic following these guideli
 ## Content
 
 **Position**: Content (Page 3 of 6)
-**Core Message**: ChatGPT使用技巧
+**Core Message**: ChatGPT 使用技巧
 
 **Text Content**:
 - Title: 「ChatGPT」
-- Subtitle: 最强AI助手
+- Subtitle: 最强 AI 助手
 - Points:
   - 写文案：给出框架，秒出初稿
   - 改文章：润色、翻译、总结
-  - 编程：写代码、找bug
+  - 编程：写代码、找 bug
   - 学习：解释概念、出题练习
 
 **Visual Concept**:
-ChatGPT logo居中，四周放射状展示功能点
+ChatGPT logo 居中，四周放射状展示功能点
 深色科技背景，霓虹绿点缀
 
 ---