flower-trellis 0.4.0-beta.4 → 0.4.0

package/enhancements/0.6/scripts/spec_router.py

@@ -2,8 +2,8 @@
 # -*- coding: utf-8 -*-
 """从 `.trellis/spec/` 发现相关项目 SOP/spec 文件。
 
-这个 helper 刻意保持轻量：只返回候选路径和命中原因，让 AI 在执行流程性或
-高影响动作前读取匹配文件；它不把完整文档注入上下文。
+这个 helper 刻意保持轻量：只返回候选路径、置信度和命中原因，让 AI 在项目
+局部知识可能影响做法的决策边界前读取匹配文件；它不把完整文档注入上下文。
 """
 
 from __future__ import annotations
@@ -21,40 +21,72 @@ MAX_BODY_CHARS = 8000
 DEFAULT_LIMIT = 3
 MIN_SCORE = 3
 MIN_BODY_ONLY_HITS = 5
-MIN_HEADING_BODY_HITS = 3
-BODY_WEAK_TOKENS = {
+MIN_ANCHORED_BODY_HITS = 2
+WEAK_TOKENS = {
     "action",
     "actions",
     "after",
+    "and",
     "before",
+    "change",
+    "changes",
+    "cli",
     "command",
     "commands",
+    "commit",
     "context",
     "current",
+    "data",
+    "documentation",
+    "edit",
     "file",
     "files",
+    "flow",
+    "flower",
+    "for",
+    "from",
+    "guide",
+    "guides",
+    "in",
+    "index",
     "match",
     "matched",
     "matches",
     "matching",
+    "md",
     "normal",
+    "of",
+    "or",
     "path",
     "paths",
     "project",
+    "py",
     "read",
+    "readme",
     "reason",
     "reasons",
     "relevant",
+    "run",
+    "simple",
+    "small",
     "sop",
     "spec",
     "status",
     "task",
     "tasks",
+    "the",
+    "to",
+    "trellis",
+    "typo",
+    "update",
+    "with",
     "workflow",
 }
-TOKEN_RE = re.compile(r"[A-Za-z0-9_.@/-]+|[\u4e00-\u9fff]{2,}")
+TOKEN_RE = re.compile(r"[A-Za-z0-9@]+|[\u4e00-\u9fff]+")
+CJK_RE = re.compile(r"^[\u4e00-\u9fff]+$")
 HEADER_RE = re.compile(r"^\s{0,3}#{1,3}\s+(.+?)\s*$", re.MULTILINE)
 FRONTMATTER_BOUNDARY_RE = re.compile(r"^---\s*$")
+MARKDOWN_LINK_RE = re.compile(r"\[([^\]]+)\]\(([^)]+\.md(?:#[^)]+)?)\)")
 
 
 @dataclass
@@ -66,7 +98,9 @@ class Candidate:
     kind: str
     load: str
     priority: str
+    confidence: str
     reasons: list[str]
+    action: str
 
 
 def find_trellis_root(start: Path) -> Path | None:
@@ -183,8 +217,45 @@ def as_list(value: Any) -> list[str]:
     return [text] if text else []
 
 
+def add_token(tokens: list[str], seen: set[str], token: str) -> None:
+    """按原始顺序追加去重 token。
+
+    Args:
+        tokens: 正在构造的 token 列表。
+        seen: 已追加 token 集合。
+        token: 待追加 token。
+
+    Returns:
+        None。
+    """
+    if len(token) < 2 or token in seen:
+        return
+    seen.add(token)
+    tokens.append(token)
+
+
+def add_cjk_tokens(tokens: list[str], seen: set[str], text: str) -> None:
+    """为连续中文文本追加有限 n-gram token。
+
+    中文没有空格分词。这里生成 2 到 6 字的 n-gram，用 token 集合匹配替代旧
+    版任意子串匹配，同时保留 `发版` 命中 `发版流程` 这类常见能力。
+
+    Args:
+        tokens: 正在构造的 token 列表。
+        seen: 已追加 token 集合。
+        text: 连续中文文本。
+
+    Returns:
+        None。
+    """
+    max_size = min(6, len(text))
+    for size in range(2, max_size + 1):
+        for start in range(0, len(text) - size + 1):
+            add_token(tokens, seen, text[start : start + size])
+
+
 def normalize_tokens(text: str) -> list[str]:
-    """提取查询 token，用于确定性的轻量匹配。
+    """提取查询或文档 token，用于确定性的轻量匹配。
 
     Args:
         text: 查询或可搜索文本。
@@ -195,14 +266,129 @@ def normalize_tokens(text: str) -> list[str]:
     seen: set[str] = set()
     tokens: list[str] = []
     for match in TOKEN_RE.finditer(text.lower()):
-        token = match.group(0).strip("._-/")
-        if len(token) < 2 or token in seen:
-            continue
-        seen.add(token)
-        tokens.append(token)
+        token = match.group(0)
+        if CJK_RE.match(token):
+            add_cjk_tokens(tokens, seen, token)
+        else:
+            add_token(tokens, seen, token)
     return tokens
 
 
+def significant_hits(query_tokens: list[str], target_tokens: list[str]) -> list[str]:
+    """计算非弱词 token 命中，保留查询 token 顺序。
+
+    Args:
+        query_tokens: 查询 token。
+        target_tokens: 待匹配文本 token。
+
+    Returns:
+        非弱词命中列表。
+    """
+    target_set = set(target_tokens)
+    return [
+        token
+        for token in query_tokens
+        if token not in WEAK_TOKENS and token in target_set
+    ]
+
+
+def collect_index_descriptions(spec_dir: Path) -> dict[str, list[str]]:
+    """从 `index.md` 链接行收集目标文档的路由描述。
+
+    Args:
+        spec_dir: `.trellis/spec` 目录。
+
+    Returns:
+        以 spec 相对路径为 key 的描述文本列表。
+    """
+    descriptions: dict[str, list[str]] = {}
+    spec_root = spec_dir.resolve()
+    for index_path in iter_spec_files(spec_dir):
+        if index_path.name != "index.md":
+            continue
+
+        text = read_markdown(index_path)
+        if text is None:
+            continue
+        _, body = parse_frontmatter(text)
+
+        for line in body.splitlines():
+            matches = list(MARKDOWN_LINK_RE.finditer(line))
+            if not matches:
+                continue
+
+            clean_line = MARKDOWN_LINK_RE.sub(lambda item: item.group(1), line).strip()
+            for match in matches:
+                link_target = match.group(2).split("#", 1)[0].strip()
+                if "://" in link_target or link_target.startswith("#"):
+                    continue
+
+                target_path = (index_path.parent / link_target).resolve()
+                try:
+                    target_rel_path = target_path.relative_to(spec_root).as_posix()
+                except ValueError:
+                    continue
+
+                if not target_path.is_file() or target_path == index_path.resolve():
+                    continue
+
+                description = f"{match.group(1)} {clean_line}".strip()
+                if description:
+                    descriptions.setdefault(target_rel_path, []).append(description)
+    return descriptions
+
+
+def classify_confidence(
+    matched_triggers: list[str],
+    path_hits: list[str],
+    header_hits: list[str],
+    index_hits: list[str],
+    body_hits: list[str],
+) -> str | None:
+    """根据强锚点和弱证据判断候选置信度。
+
+    Args:
+        matched_triggers: frontmatter trigger 命中。
+        path_hits: 路径命中。
+        header_hits: 标题命中。
+        index_hits: index 描述命中。
+        body_hits: 正文样本命中。
+
+    Returns:
+        `high` / `medium`；证据不足时返回 None。
+    """
+    if matched_triggers:
+        return "high"
+
+    anchor_groups = [path_hits, header_hits, index_hits]
+    anchor_count = sum(1 for group in anchor_groups if group)
+    if len(path_hits) >= 2 or len(header_hits) >= 2 or len(index_hits) >= 2:
+        return "high"
+    if anchor_count >= 2:
+        return "high"
+    if anchor_count == 1 and len(body_hits) >= MIN_ANCHORED_BODY_HITS:
+        return "high"
+    if anchor_count == 1:
+        return "medium"
+    if len(body_hits) >= MIN_BODY_ONLY_HITS:
+        return "medium"
+    return None
+
+
+def action_for_confidence(confidence: str) -> str:
+    """按置信度返回读取建议。
+
+    Args:
+        confidence: 候选置信度。
+
+    Returns:
+        面向 AI 的行动建议。
+    """
+    if confidence == "high":
+        return "read before acting"
+    return "read if clearly relevant"
+
+
 def read_markdown(path: Path) -> str | None:
     """以容错 UTF-8 方式读取 Markdown 文件。
 
@@ -239,7 +425,13 @@ def iter_spec_files(spec_dir: Path) -> list[Path]:
     return sorted(result)
 
 
-def score_file(root: Path, path: Path, query: str, query_tokens: list[str]) -> Candidate | None:
+def score_file(
+    root: Path,
+    path: Path,
+    query: str,
+    query_tokens: list[str],
+    index_descriptions: dict[str, list[str]],
+) -> Candidate | None:
     """按查询为一个 Markdown spec 文件打分。
 
     Args:
@@ -247,6 +439,7 @@ def score_file(root: Path, path: Path, query: str, query_tokens: list[str]) -> C
         path: Markdown 文件路径。
         query: 原始查询文本。
         query_tokens: 标准化后的查询 token。
+        index_descriptions: 从 index.md 收集的目标文档描述。
 
     Returns:
         分数达到阈值时返回候选项，否则返回 None。
@@ -258,11 +451,13 @@ def score_file(root: Path, path: Path, query: str, query_tokens: list[str]) -> C
     metadata, body = parse_frontmatter(text)
     rel_path = path.relative_to(root).as_posix()
     spec_rel_path = path.relative_to(root / ".trellis" / "spec").as_posix()
-    spec_rel_lower = spec_rel_path.lower()
+    spec_rel_tokens = normalize_tokens(spec_rel_path)
     body_sample = body[:MAX_BODY_CHARS]
-    body_lower = body_sample.lower()
+    body_tokens = normalize_tokens(body_sample)
     headers = HEADER_RE.findall(body)
-    header_text = " ".join(headers).lower()
+    header_tokens = normalize_tokens(" ".join(headers))
+    index_text = " ".join(index_descriptions.get(spec_rel_path, []))
+    index_tokens = normalize_tokens(index_text)
 
     kind = str(metadata.get("kind") or "").strip()
     load = str(metadata.get("load") or "").strip()
@@ -282,31 +477,35 @@ def score_file(root: Path, path: Path, query: str, query_tokens: list[str]) -> C
         score += 8 * len(matched_triggers)
         reasons.append(f"matched triggers: {', '.join(matched_triggers[:5])}")
 
-    path_hits = [token for token in query_tokens if token in spec_rel_lower]
+    path_hits = significant_hits(query_tokens, spec_rel_tokens)
     if path_hits:
-        score += 4 * len(path_hits)
+        score += 5 * len(path_hits)
         reasons.append(f"matched path tokens: {', '.join(path_hits[:5])}")
 
-    header_hits = [token for token in query_tokens if token in header_text]
+    header_hits = significant_hits(query_tokens, header_tokens)
     if header_hits:
         score += 3 * len(header_hits)
         reasons.append(f"matched headings: {', '.join(header_hits[:5])}")
 
-    raw_body_hits = [token for token in query_tokens if token in body_lower]
-    body_hits = [token for token in raw_body_hits if token not in BODY_WEAK_TOKENS]
+    index_hits = significant_hits(query_tokens, index_tokens)
+    if index_hits:
+        score += 4 * len(index_hits)
+        reasons.append(f"matched index descriptions: {', '.join(index_hits[:5])}")
+
+    body_hits = significant_hits(query_tokens, body_tokens)
     if body_hits:
         score += len(body_hits)
         reasons.append(f"matched body tokens: {', '.join(body_hits[:5])}")
 
-    # 避免 `json` / `output` / `spec` 这类泛词把只有正文弱命中的文件全部拉进上下文。
-    strong_match = (
-        bool(matched_triggers)
-        or bool(path_hits)
-        or len(header_hits) >= 2
-        or (bool(header_hits) and len(body_hits) >= MIN_HEADING_BODY_HITS)
-        or len(body_hits) >= MIN_BODY_ONLY_HITS
+    # 避免 `to` / `flow` / `commit` 这类泛词或少量正文词把无关文件拉进上下文。
+    confidence = classify_confidence(
+        matched_triggers,
+        path_hits,
+        header_hits,
+        index_hits,
+        body_hits,
     )
-    if not strong_match:
+    if confidence is None:
         return None
 
     if kind.lower() in {"sop", "procedure", "guide", "thinking-guide"} and score > 0:
@@ -325,7 +524,9 @@ def score_file(root: Path, path: Path, query: str, query_tokens: list[str]) -> C
         kind=kind or ("thinking-guide" if "/guides/" in f"/{rel_path}" else "spec"),
         load=load,
         priority=priority,
+        confidence=confidence,
         reasons=reasons,
+        action=action_for_confidence(confidence),
     )
 
 
@@ -345,12 +546,20 @@ def find_candidates(root: Path, query: str, limit: int) -> list[Candidate]:
         return []
 
     candidates: list[Candidate] = []
-    for path in iter_spec_files(root / ".trellis" / "spec"):
-        candidate = score_file(root, path, query, query_tokens)
+    spec_dir = root / ".trellis" / "spec"
+    index_descriptions = collect_index_descriptions(spec_dir)
+    for path in iter_spec_files(spec_dir):
+        candidate = score_file(root, path, query, query_tokens, index_descriptions)
         if candidate:
             candidates.append(candidate)
 
-    candidates.sort(key=lambda item: (-item.score, item.path))
+    candidates.sort(
+        key=lambda item: (
+            0 if item.confidence == "high" else 1,
+            -item.score,
+            item.path,
+        )
+    )
     return candidates[:limit]
 
 
@@ -372,13 +581,14 @@ def format_markdown(candidates: list[Candidate]) -> str:
         lines.append(f"- {candidate.path}")
         lines.append(f"  kind: {candidate.kind}")
         lines.append(f"  score: {candidate.score}")
+        lines.append(f"  confidence: {candidate.confidence}")
         if candidate.load:
             lines.append(f"  load: {candidate.load}")
         if candidate.priority:
             lines.append(f"  priority: {candidate.priority}")
         if candidate.reasons:
             lines.append(f"  reason: {'; '.join(candidate.reasons)}")
-        lines.append("  action: read before acting")
+        lines.append(f"  action: {candidate.action}")
     return "\n".join(lines)
 
 
@@ -396,10 +606,11 @@ def format_json(candidates: list[Candidate]) -> str:
             "file": candidate.path,
             "kind": candidate.kind,
             "score": candidate.score,
+            "confidence": candidate.confidence,
             "load": candidate.load,
             "priority": candidate.priority,
             "reason": candidate.reasons,
-            "action": "read before acting",
+            "action": candidate.action,
         }
         for candidate in candidates
     ]

package/enhancements/MANIFEST.json

@@ -1,14 +1,13 @@
 {
-  "syncedAt": "2026-07-01T04:27:03.524Z",
+  "syncedAt": "2026-07-02T11:06:42.782Z",
   "syncedFrom": "vendor/skill-garden",
-  "sourceCommit": "7a9b882db76500b49b38cf423be682fb06effe1a",
+  "sourceCommit": "a70185e3b372058363296e81e2138f4f239d6e3b",
   "common": {
     "codexSkills": [
       "craft-rpa",
       "craft-slides",
       "humanize-writing",
       "open-idea",
-      "sub2api-account-json-fix",
       "torrent-analyze"
     ],
     "claudeSkills": [
@@ -16,7 +15,6 @@
       "craft-slides",
       "humanize-writing",
       "open-idea",
-      "sub2api-account-json-fix",
       "torrent-analyze"
     ]
   },
@@ -140,6 +138,7 @@
       ],
       "scripts": [
         "auto_loop.py",
+        "push_snapshot.py",
         "spec_router.py"
       ]
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flower-trellis",
-  "version": "0.4.0-beta.4",
+  "version": "0.4.0",
   "description": "一键安装/升级 Trellis 并自动融合 skill-garden 强化包(默认 Claude + agents)",
   "type": "module",
   "bin": {

package/src/lib/copy-scripts.js

@@ -24,6 +24,8 @@ export function copyScriptAssets(target, variantDir, skills = []) {
     let aliases = [];
     if (name === "auto_loop") {
       aliases = ["auto-loop", "auto-loop-runner", "trellis-auto-loop"];
+    } else if (name === "push_snapshot") {
+      aliases = ["push-snapshot", "trellis-push", "push", "snapshot"];
     } else if (name === "spec_router") {
       aliases = [
         "spec-router",

package/src/lib/skill-catalog.js

@@ -40,7 +40,6 @@ const SKILL_DESCRIPTION_OVERRIDES = {
   "plan-version": "规划版本任务、波次和分工",
   push: "提交、推送并同步任务进度",
   "re-implement": "需求变更后重新实现",
-  "sub2api-account-json-fix": "批量补全并推送 sub2api 账号 JSON",
   "sync-prd": "根据代码或需求变化同步 PRD",
   "torrent-analyze": "解析磁链或种子 hash 并整理信息",
   "trellis-analyze-task": "深度分析并细化任务",

package/enhancements/common/.common/.claude/skills/sub2api-account-json-fix/SKILL.md

@@ -1,47 +0,0 @@
----
-name: sub2api-account-json-fix
-description: 修正当前项目里的 sub2api 账号导出 JSON，并把这些账号直接推送到 sub2api admin 接口。用于批量推送 `sub2api-account-*.json` 到远端 sub2api，尤其适合先同步模板里的 `model_mapping`、`allow_overages`，再按指定 group_ids 创建账号。
-argument-hint: <template-json> [target-json...]
-disable-model-invocation: true
----
-
-# Sub2API 账号推送
-
-先确认模板账号，再运行项目内的推送脚本。
-
-## 规则
-
-- 先用模板账号补齐目标账号的 `credentials.model_mapping`。
-- 确保目标账号包含 `extra.allow_overages`。
-- 把 `name` 改成 `credentials.email`。
-- 然后把代理推送到 sub2api，再逐个创建账号。
-- 创建账号后默认立刻关闭调度。
-- 如果账号带有 `refresh_token`，创建后默认立刻调用一次 refresh，确保远端拿到最新 access token。
-- 如果 `.claude/skills/sub2api-account-json-fix/env/push.env` 不存在，继续检查系统环境变量。
-- 如果地址或 token 仍未配置，或者 token 还是 `admin-xxxx` 这种示例值，先向用户索要真实值，不要直接推送。
-
-## 技能目录配置
-
-优先读取：
-
-- `.claude/skills/sub2api-account-json-fix/env/push.env`
-
-支持这些键：
-
-- `SUB2API_ACCOUNT_JSON_FIX_PUSH_ADMIN_BASE_URL`
-- `SUB2API_ACCOUNT_JSON_FIX_PUSH_TOKEN`
-- `SUB2API_ACCOUNT_JSON_FIX_PUSH_GROUP_IDS`
-- `SUB2API_ACCOUNT_JSON_FIX_PUSH_SCHEDULABLE`
-- `SUB2API_ACCOUNT_JSON_FIX_PUSH_REFRESH_AFTER_CREATE`
-
-## 执行方式
-
-如果用户给了参数，按“第一个参数是模板文件，后续参数是目标文件”的规则执行；否则先向用户确认模板文件。
-
-运行：
-
-```bash
-bash .claude/skills/sub2api-account-json-fix/scripts/run.sh $ARGUMENTS
-```
-
-如果用户没有显式要求写回本地文件，就不要自动加 `--write`；先预览或直接推送内存中的规范化结果即可。

package/enhancements/common/.common/.claude/skills/sub2api-account-json-fix/env/push.env.example

@@ -1,8 +0,0 @@
-# Claude Code 项目技能的本地配置示例。
-# 把本文件复制为同目录下的 push.env 后再填写真实值。
-
-SUB2API_ACCOUNT_JSON_FIX_PUSH_ADMIN_BASE_URL=http://127.0.0.1:8080/api/v1/admin
-SUB2API_ACCOUNT_JSON_FIX_PUSH_TOKEN=admin-xxxx
-SUB2API_ACCOUNT_JSON_FIX_PUSH_GROUP_IDS=3,7
-SUB2API_ACCOUNT_JSON_FIX_PUSH_SCHEDULABLE=false
-SUB2API_ACCOUNT_JSON_FIX_PUSH_REFRESH_AFTER_CREATE=true

package/enhancements/common/.common/.claude/skills/sub2api-account-json-fix/scripts/run.sh

@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
-CLAUDE_SKILL_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
-SKILL_GARDEN_ROOT="$(cd "$CLAUDE_SKILL_DIR/../../.." && pwd -P)"
-MAIN_SCRIPT="$SKILL_GARDEN_ROOT/.codex/skills/sub2api-account-json-fix/scripts/fix_exported_account_json.py"
-LOCAL_ENV_FILE="$CLAUDE_SKILL_DIR/env/push.env"
-
-export SUB2API_ACCOUNT_JSON_FIX_ENV_FILE="$LOCAL_ENV_FILE"
-
-if [[ -f "$LOCAL_ENV_FILE" ]]; then
-  set -a
-  # shellcheck disable=SC1090
-  source "$LOCAL_ENV_FILE"
-  set +a
-fi
-
-if [[ $# -lt 1 ]]; then
-  echo "用法: run.sh <template-json> [target-json...]" >&2
-  exit 2
-fi
-
-TEMPLATE_FILE="$1"
-shift
-
-python "$MAIN_SCRIPT" --template "$TEMPLATE_FILE" "$@" --push