@yuhan1124/draw-prompt 0.4.1 → 0.4.3

package/README.md

@@ -36,6 +36,7 @@ Prompt 的默认结构是三段：`User visual brief` 原始视觉需求、`Styl
 ```bash
 npx @yuhan1124/draw-prompt status
 npx @yuhan1124/draw-prompt convert "茶饮新品海报，写冷泡系列"
+npx @yuhan1124/draw-prompt install-skill --target codex
 ```
 
 `npx` 包内置同一份 Python CLI 和 references。执行时优先使用 `uv run` 自动处理
@@ -44,11 +45,29 @@ PEP723 依赖；没有 `uv` 时退回 `python3`。`overlay`、`visual-check`、`
 
 `visual-regress` / `benchmark` 用到的回归集只保留在开发仓库本地，不随 npm 包发布。
 
-## 安装（独立 repo + 软链）
+## 安装 skill
+
+普通用户优先从公网 npm 安装到 agent 的 skills 目录：
+
+```bash
+# 安装到 Codex：~/.codex/skills/draw-prompt
+npx @yuhan1124/draw-prompt install-skill --target codex
+
+# 安装到 Claude Code：~/.claude/skills/draw-prompt
+npx @yuhan1124/draw-prompt install-skill --target claude
+
+# 同时安装两边；更新已有安装时加 --force
+npx @yuhan1124/draw-prompt install-skill --target both --force
+```
+
+`install-skill` 默认复制 npm 包内的运行文件，避免软链到 npx 缓存导致后续路径失效。它只复制
+`SKILL.md`、CLI、references 和必要元数据；开发仓库里的 `tests/`、`tmp/`、`golden-cases.jsonl`、
+`visual-cases.jsonl` 不会进入 npm 包或安装目录。
+
+开发者本地调试也可以软链 repo：
 
 ```bash
-# 1) 克隆/进入本 repo（这里假设在 ~/Desktop/draw-prompt）
-# 2) 软链到 Claude Code 的 skills 目录，让它被即时发现
+# 克隆/进入本 repo（这里假设在 ~/Desktop/draw-prompt）
 ln -s ~/Desktop/draw-prompt ~/.claude/skills/draw-prompt
 ```
 

package/SKILL.md

@@ -8,7 +8,7 @@ description: >-
   画图的指令"、"优化我的出图 prompt"、"按我的风格生成 prompt"，或在用 GPT Image 2 /
   gpt-image-2 出图前需要一段精准提示词时，使用本 skill。
 metadata:
-  version: 0.4.1
+  version: 0.4.3
   openclaw:
     anyBins: ["uv", "python3"]
 ---
@@ -60,6 +60,7 @@ prompt」「给 Codex 出图的指令」「优化这条出图 prompt」等意图
    还是"想先聊方向"。解析时先锁定用户显式目标和约束，后续所有增强都不能越过这些约束。
 
 2. **优先自动转化，并选对入口**。能直接交付时，按场景运行对应命令：
+   - 安装到 agent skill 目录：`prompt_cli.py install-skill --target codex|claude [--force]`
    - 单图：`prompt_cli.py convert "<自然语言画图需求>" [--style-preset premium] [--strict-text] [--out <path>] [--record-pending]`
    - 长输入整理成多张图：`prompt_cli.py compose "<长输入>" --max-images 6 [--style-preset corporate] [--strict-text]`
    - 同一输入多风格探索：`prompt_cli.py variants "<自然语言画图需求>" --style-presets all`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuhan1124/draw-prompt",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "Convert natural-language image requests into high-quality gpt-image-2 prompts and Codex handoff blocks.",
   "type": "commonjs",
   "bin": {

package/scripts/prompt_cli.py

@@ -14,6 +14,7 @@ codex exec）。本 CLI 的 `handoff` 子命令负责把 prompt 包装成一段
 粘贴/转交给 Codex 的现成指令，但不会自己去执行它。
 
 CLI 只干确定性的脏活：
+  install-skill  从 npx/npm 包安装到 Codex/Claude skills 目录
   convert   自然语言画图需求 -> Prompt / handoff
   compose   长输入/文档 -> 多张配套图的视觉计划 + Prompt
   variants  同一需求 -> 多风格 Prompt 组
@@ -49,6 +50,7 @@ import hashlib
 import json
 import os
 import re
+import shutil
 import sys
 from datetime import datetime, timezone
 from pathlib import Path
@@ -133,7 +135,27 @@ def ensure_home() -> None:
 
 
 SCHEMA_VERSION = 1
-COMPILER_VERSION = "0.4.1"
+COMPILER_VERSION = "0.4.3"
+
+
+PACKAGED_SKILL_FILES = [
+    "SKILL.md",
+    "README.md",
+    "LICENSE",
+    "package.json",
+    "agents/openai.yaml",
+    "bin/draw-prompt.js",
+    "scripts/prompt_cli.py",
+    "references/codex-handoff.md",
+    "references/compile.md",
+    "references/conversion-skill-plan.md",
+    "references/gallery.md",
+    "references/harness.md",
+]
+
+
+def package_root() -> Path:
+    return Path(__file__).resolve().parent.parent
 
 
 # --------------------------------------------------------------------------- #
@@ -2076,6 +2098,7 @@ DEFAULT_VARIANT_PRESETS = ["corporate", "premium", "minimal", "flat-vector", "ph
 
 ASPECT_SIZE = {
     "3:4": "portrait",
+    "4:5": "portrait",
     "4:3": "landscape",
     "16:9": "landscape",
     "9:16": "portrait",
@@ -2095,7 +2118,7 @@ TEMPLATE_DEFS = {
         "asset_type": "poster",
         "label": "中文促销海报",
         "layout": "large headline zone, hero product zone, price/offer block, quiet footer",
-        "keywords": ["促销", "新品", "价格", "优惠", "茶饮", "冷泡", "海报"],
+        "keywords": ["促销", "新品", "价格", "优惠", "茶饮", "冷泡"],
     },
     "poster_brand_kv": {
         "asset_type": "poster",
@@ -2107,7 +2130,7 @@ TEMPLATE_DEFS = {
         "asset_type": "poster",
         "label": "活动海报",
         "layout": "title, date/venue, speaker or theme block, organizer footer",
-        "keywords": ["活动", "会议", "展览", "event", "workshop", "讲座"],
+        "keywords": ["活动", "会议", "发布会", "展览", "event", "workshop", "讲座"],
     },
     "poster_info_dense": {
         "asset_type": "poster",
@@ -2421,11 +2444,17 @@ def extract_required_texts(request: str, explicit_texts: list[str]) -> list[str]
         text = text.strip(" \t\n\r，,、。；;：:.!?！？")
         text = re.sub(r"^(?:[^：:]{0,12}(?:指标卡|卡片|列表|标题|模块|节点|步骤|栏目|分支))[：:]", "", text)
         text = re.sub(r"^(?:顶部|底部|中间|左侧|右侧|上方|下方|首页|页面)?(?:主标题|副标题|标题)\s+", "", text)
+        text = re.sub(r"^(?:问候语|核心卡片|主要按钮|主按钮|按钮)\s+", "", text)
+        text = re.sub(r"^(?:是|为|叫)\s+", "", text)
         text = re.sub(r"^(?:一个|一枚|一项)?(?:明显的|醒目的|主要的|primary\s+)?(.{1,16})按钮$", r"\1", text, flags=re.IGNORECASE)
         text = re.sub(r"(?:网格|列表|区域|模块)$", "", text)
         text = re.sub(r"(?:要)?(?:渲染)?(?:清晰|清楚|可读|明显)$", "", text)
         text = re.sub(r"(?:这些)?元素$", "", text)
         text = re.sub(r"(?:[一二三四五六七八九十\d]+个)?步骤$", "", text)
+        if re.search(r"箭头.*关系|关系.*箭头|展示输入输出关系", text):
+            return ""
+        if re.fullmatch(r"[A-Za-z]{1,2}", text) and text.upper() not in {"AI", "UI"}:
+            return ""
         if text in {"顶部导航", "底部导航", "左侧导航", "右侧导航", "导航栏", "顶部栏", "状态栏", "箭头关系", "箭头", "关系"}:
             return ""
         return text.strip(" \t\n\r，,、。；;：:.!?！？")
@@ -2458,6 +2487,31 @@ def extract_required_texts(request: str, explicit_texts: list[str]) -> list[str]
     for pat in patterns:
         for match in re.finditer(pat, request):
             add_candidate(match.start(1), match.group(1))
+    labeled_single_patterns = [
+        r"(?:主标题|标题|副标题|主题|时间|地点)\s*(?:写上|写|显示|为|是|叫|[:：])\s*([^，,、。；;\n]{2,40})",
+        r"(?:主标题|标题|副标题|主题|时间|地点)\s+([^，,、。；;\n]{2,40})",
+        r"(?:时间|地点)\s+([^，,、。；;\n]{2,40})",
+        r"(?:核心卡片|主要按钮|主按钮|按钮)\s*(?:写上|写|显示|为|是|叫|[:：])\s*([^，,。；;\n]{2,30})",
+        r"(?:需要)?包含\s*([A-Za-z][A-Za-z0-9_-]{2,30})\s*字样",
+        r"(?:名为|叫做|名称是|名字叫)\s*([A-Za-z][A-Za-z0-9_-]{2,30})\b",
+    ]
+    for pat in labeled_single_patterns:
+        for match in re.finditer(pat, request, flags=re.IGNORECASE):
+            add_candidate(match.start(1), match.group(1))
+    for match in re.finditer(
+        r"问候语\s*(?:写上|写|显示|为|是|叫|[:：])?\s*(.+?)(?=，(?:核心|下方|上方|主要|页面|风格)|[。；;\n]|$)",
+        request,
+        flags=re.IGNORECASE,
+    ):
+        add_candidate(match.start(1), match.group(1))
+    for match in re.finditer(
+        r"(?:需要)?(?:出现|展示|包含|包括)?(?:文案|文字)\s*(?:写上|写|显示|为|是|[:：])\s*([^。；;\n]{2,100})",
+        request,
+        flags=re.IGNORECASE,
+    ):
+        value = match.group(1)
+        for part_match in re.finditer(r"[^、;；/|]+", value):
+            add_candidate(match.start(1) + part_match.start(), part_match.group(0))
     title_patterns = [
         r"\btitle\s*[：:]\s*([^,，。.;；\n]{1,40})",
         r"(?:Chinese\s+title|title\s+in\s+Chinese)\s*[：:]\s*(.+?)(?=\s+(?:Bullet\s+points?|Icon|Column\s+\d+|Bottom\s+area|High\s+contrast)\b|[，,。.;；\n]|$)",
@@ -2475,8 +2529,8 @@ def extract_required_texts(request: str, explicit_texts: list[str]) -> list[str]
             value = match.group(1)
             for part_match in re.finditer(r"[^,，、;；]+", value):
                 add_candidate(match.start(1) + part_match.start(), part_match.group(0))
-    text_hint = r"(?:写上|写|显示|文案|标题|品牌名|wordmark)"
-    for match in re.finditer(rf"{text_hint}[：:\s]*(?:写上|写|显示|为|叫)?[：:\s]*([^，,、。；;,.]{{2,24}})", request, flags=re.IGNORECASE):
+    text_hint = r"(?:写上|写|显示|品牌名|wordmark|(?<!副)标题)"
+    for match in re.finditer(rf"{text_hint}[：:\s]*(?:写上|写|显示|为|是|叫)?[：:\s]*([^，,、。；;,.]{{2,30}})", request, flags=re.IGNORECASE):
         add_candidate(match.start(1), match.group(1))
     for match in re.finditer(r"(?:文字|文案)\s*(?:写上|写|显示|为|是|[:：])\s*([^，,、。；;,.]{2,24})", request, flags=re.IGNORECASE):
         add_candidate(match.start(1), match.group(1))
@@ -2495,12 +2549,18 @@ def merge_texts(primary: list[str], extra: list[str]) -> list[str]:
         text = item.strip(" \t\n\r，,、。；;：:.!?！？")
         text = re.sub(r"^(?:[^：:]{0,12}(?:指标卡|卡片|列表|标题|模块|节点|步骤|栏目|分支))[：:]", "", text)
         text = re.sub(r"^(?:顶部|底部|中间|左侧|右侧|上方|下方|首页|页面)?(?:主标题|副标题|标题)\s+", "", text)
+        text = re.sub(r"^(?:问候语|核心卡片|主要按钮|主按钮|按钮)\s+", "", text)
+        text = re.sub(r"^(?:是|为|叫)\s+", "", text)
         text = re.sub(r"^(?:一个|一枚|一项)?(?:明显的|醒目的|主要的|primary\s+)?(.{1,16})按钮$", r"\1", text, flags=re.IGNORECASE)
         text = re.sub(r"(?:网格|列表|区域|模块)$", "", text)
         text = re.sub(r"(?:要)?(?:渲染)?(?:清晰|清楚|可读|明显)$", "", text)
         text = re.sub(r"(?:这些)?元素$", "", text)
         text = re.sub(r"(?:[一二三四五六七八九十\d]+个)?步骤$", "", text)
         text = text.strip(" \t\n\r，,、。；;：:.!?！？")
+        if re.search(r"箭头.*关系|关系.*箭头|展示输入输出关系", text):
+            continue
+        if re.fullmatch(r"[A-Za-z]{1,2}", text) and text.upper() not in {"AI", "UI"}:
+            continue
         if text in {"顶部导航", "底部导航", "左侧导航", "右侧导航", "导航栏", "顶部栏", "状态栏", "箭头关系", "箭头", "关系"}:
             continue
         key = re.sub(r"\s+", "", text)
@@ -2622,6 +2682,8 @@ def infer_template_id(request: str, asset_type: str, override: str | None = None
     if asset_type == "poster":
         if any(keyword_in_text(kw, lower) for kw in ["小红书", "社媒", "方图", "封面", "cover", "social"]):
             return "poster_social_cover"
+        if any(keyword_in_text(kw, lower) for kw in ["活动", "会议", "发布会", "展览", "event", "workshop", "讲座"]):
+            return "poster_event"
         if any(keyword_in_text(kw, lower) for kw in ["品牌", "主视觉", "kv", "brand key visual"]):
             return "poster_brand_kv"
         if any(keyword_in_text(kw, lower) for kw in ["信息", "清单", "流程", "说明"]):
@@ -3220,7 +3282,7 @@ def lint_prompt(prompt: str, asset_type: str | None, quality: str | None, requir
     lower = compact.lower()
     if len(compact) < 80:
         add("error", "prompt.too_short", "Prompt 太短，缺少可执行的视觉约束。")
-    if not re.search(r"\b(3:4|4:3|16:9|9:16|1:1|portrait|landscape|square)\b", lower):
+    if not re.search(r"(?<!\d)(?:3:4|4:5|4:3|16:9|9:16|1:1)(?!\d)|\b(?:portrait|landscape|square)\b", lower):
         add("error", "prompt.missing_aspect", "Prompt 缺少画幅/宽高比/制品类型开场。")
     if not re.search(r"\b(avoid|no |without|不要|避免)\b", lower):
         add("warning", "prompt.missing_negative", "Prompt 缺少针对常见失败模式的否定项。")
@@ -5425,6 +5487,86 @@ def cmd_adapt(args: argparse.Namespace) -> int:
     return 1 if any(has_lint_error(item["lint"]) for item in variants) else 0
 
 
+def default_skill_parent(target: str) -> Path:
+    if target == "claude":
+        return Path.home() / ".claude" / "skills"
+    return Path.home() / ".codex" / "skills"
+
+
+def is_draw_prompt_install(path: Path) -> bool:
+    skill = path / "SKILL.md"
+    if not skill.exists():
+        return False
+    try:
+        head = skill.read_text(encoding="utf-8")[:500]
+    except OSError:
+        return False
+    return "name: draw-prompt" in head
+
+
+def copy_packaged_skill(src_root: Path, dst: Path) -> list[str]:
+    copied = []
+    for rel in PACKAGED_SKILL_FILES:
+        src = src_root / rel
+        if not src.exists():
+            raise FileNotFoundError(f"缺少发布文件：{src}")
+        target = dst / rel
+        target.parent.mkdir(parents=True, exist_ok=True)
+        shutil.copy2(src, target)
+        copied.append(rel)
+    return copied
+
+
+def install_skill_to_path(dst: Path, mode: str, force: bool) -> dict:
+    src_root = package_root()
+    dst = dst.expanduser()
+    if dst.exists() or dst.is_symlink():
+        if not force:
+            if is_draw_prompt_install(dst):
+                return {
+                    "path": str(dst),
+                    "status": "exists",
+                    "message": "draw-prompt skill 已存在；如需更新请加 --force。",
+                    "mode": mode,
+                }
+            raise FileExistsError(f"目标路径已存在且不像 draw-prompt skill：{dst}。如确认覆盖，请加 --force。")
+        if dst.is_symlink() or dst.is_file():
+            dst.unlink()
+        else:
+            shutil.rmtree(dst)
+    dst.parent.mkdir(parents=True, exist_ok=True)
+    if mode == "symlink":
+        dst.symlink_to(src_root, target_is_directory=True)
+        copied = []
+    else:
+        dst.mkdir(parents=True, exist_ok=True)
+        copied = copy_packaged_skill(src_root, dst)
+    return {"path": str(dst), "status": "installed", "mode": mode, "files": copied, "source": str(src_root)}
+
+
+def cmd_install_skill(args: argparse.Namespace) -> int:
+    targets = ["codex", "claude"] if args.target == "both" else [args.target]
+    if args.path and len(targets) > 1:
+        print("--path 只能和单个 --target 一起使用，不能用于 --target both。", file=sys.stderr)
+        return 2
+    results = []
+    try:
+        for target in targets:
+            dst = Path(args.path).expanduser() if args.path else default_skill_parent(target) / "draw-prompt"
+            results.append({"target": target, **install_skill_to_path(dst, args.mode, args.force)})
+    except Exception as exc:
+        print(f"install-skill 失败：{exc}", file=sys.stderr)
+        return 2
+    if args.json:
+        print(json.dumps({"results": results}, ensure_ascii=False, indent=2))
+    else:
+        for item in results:
+            print(f"{item['target']}: {item['status']} {item['path']} ({item['mode']})")
+            if item.get("message"):
+                print(f"  {item['message']}")
+    return 0
+
+
 # --------------------------------------------------------------------------- #
 # status
 # --------------------------------------------------------------------------- #
@@ -5440,6 +5582,10 @@ def cmd_status(args: argparse.Namespace) -> int:
     print(f"  自带范例库 : {own}  ({'可用' if own.exists() else '缺失！'})")
     gi = Path.home() / ".claude" / "skills" / "gpt-image" / "references" / "gallery.md"
     print(f"  可选扩展库 : gpt-image  ({'可用' if gi.exists() else '未装（不影响）'})")
+    codex_skill = Path.home() / ".codex" / "skills" / "draw-prompt"
+    claude_skill = Path.home() / ".claude" / "skills" / "draw-prompt"
+    print(f"  Codex skill: {codex_skill}  ({'已安装' if is_draw_prompt_install(codex_skill) else '未安装，可运行 install-skill --target codex'})")
+    print(f"  Claude skill: {claude_skill}  ({'已安装' if is_draw_prompt_install(claude_skill) else '未安装，可运行 install-skill --target claude'})")
     print("  ── 下游出图通道（本 skill 不主动调用，仅提示可用性）──")
     print(f"  codex CLI  : {which('codex') or '未找到'}")
     plugin = Path.home() / ".claude" / "plugins" / "cache" / "codex-image-in-cc"
@@ -5482,6 +5628,14 @@ def build_parser() -> argparse.ArgumentParser:
     p = argparse.ArgumentParser(prog="prompt_cli.py", description="draw-prompt：自然语言画图需求 -> 生图 Prompt / handoff（不主动出图）")
     sub = p.add_subparsers(dest="cmd", required=True)
 
+    pis = sub.add_parser("install-skill", help="把当前包安装到 Codex/Claude skills 目录")
+    pis.add_argument("--target", choices=["codex", "claude", "both"], default="codex", help="默认安装到 ~/.codex/skills/draw-prompt")
+    pis.add_argument("--path", help="覆盖安装目标路径；只能和单个 target 一起用")
+    pis.add_argument("--mode", choices=["copy", "symlink"], default="copy", help="默认复制发布文件，避免 npx 缓存路径失效")
+    pis.add_argument("--force", action="store_true", help="覆盖已有 draw-prompt skill")
+    pis.add_argument("--json", action="store_true")
+    pis.set_defaults(func=cmd_install_skill)
+
     pc = sub.add_parser("convert", help="自然语言画图需求 -> 高质量生图 Prompt / handoff")
     pc.add_argument("request_text", nargs="+", help="自然语言画图需求")
     pc.add_argument("--asset-type", choices=sorted(ASSET_ROUTES.keys()), help="覆盖自动识别的资产类型")