@oh-story/dsh 0.1.10 → 0.1.12

package/lib/oh-story/skills/story-long-write/scripts/wordcount_core.py

@@ -26,8 +26,71 @@ _FRONTMATTER_KEY_RE = re.compile(r"^[A-Za-z_\u3400-\u9FFF][^:\n]{0,80}:[ \t]*(?:
 _LEADING_BLANK_RE = re.compile(r"^[\u0009\u0020\u3000]*$")
 _ATX_HEADING_RE = re.compile(r"^[\u0009\u0020]{0,3}#{1,6}[\u0009\u0020]+\S")
 _POSITIVE_INTEGER_RE = re.compile(r"^[1-9]\d*$")
-_TARGET_LINE_RE = re.compile(r"^[ \t>*-]*字数目标[ \t]*[:：][ \t]*([1-9]\d*)[ \t]*(?:字)?[ \t]*$", re.MULTILINE)
-_METRIC_LINE_RE = re.compile(r"^[ \t>*-]*字数口径[ \t]*[:：][ \t]*([A-Za-z0-9_-]+)[ \t]*$", re.MULTILINE)
+# 细纲「字数目标」「字数范围」「字数口径」的唯一写法语法；check-outline-contract.js 逐字镜像同一组正则，
+# scripts/test-storyctl.py 用同一批写法同时跑两边，保证细纲验收过了、章节检查不会再拒。
+# 值里一个数字都没有的目标/范围行（「字数目标：按卷规划」）是说明文字，不参与取值。
+_NUMBER = r"([1-9][0-9]{0,2}(?:[,，][0-9]{3})+|[1-9][0-9]*)"
+_NOTE = r"(?:[（(][^（）()]*[）)])?"
+_TARGET_VALUE_RE = re.compile(rf"^(?:约|大约)?[ \t]*{_NUMBER}[ \t]*字?(?:左右)?[ \t]*{_NOTE}$")
+_RANGE_VALUE_RE = re.compile(
+    rf"^{_NUMBER}[ \t]*字?[ \t]*(?:-|~|～|—|–|－|至|到)[ \t]*{_NUMBER}[ \t]*字?[ \t]*{_NOTE}$"
+)
+_METRIC_VALUE_RE = re.compile(rf"^([A-Za-z0-9_-]+)[ \t]*{_NOTE}$")
+_HAS_DIGIT_RE = re.compile(r"[0-9０-９]")
+
+
+def _field_values(text: str, label: str) -> list[str]:
+    pattern = re.compile(
+        rf"^[ \t>]*(?:[-*+][ \t]*)?(?:\*\*)?{label}(?:\*\*)?[ \t]*[:：][ \t]*(.*?)[ \t]*$", re.MULTILINE
+    )
+    return [value.replace("**", "").strip() for value in pattern.findall(text)]
+
+
+def _numeric_field_values(text: str, label: str) -> list[str]:
+    return [raw for raw in _field_values(text, label) if _HAS_DIGIT_RE.search(raw)]
+
+
+def _number(raw: str) -> int:
+    return int(re.sub(r"[,，]", "", raw))
+
+
+def parse_target_field(text: str) -> dict[str, Any]:
+    """Return {"status": ok|missing|invalid|conflict, "value": int|None, "raw": [...]}."""
+    raws = _numeric_field_values(normalize_newlines(text).lstrip("\ufeff"), "字数目标")
+    if not raws:
+        return {"status": "missing", "value": None, "raw": raws}
+    matches = [_TARGET_VALUE_RE.fullmatch(raw) for raw in raws]
+    if not all(matches):
+        return {"status": "invalid", "value": None, "raw": raws}
+    values = sorted({_number(match.group(1)) for match in matches if match})
+    if len(values) != 1:
+        return {"status": "conflict", "value": None, "raw": raws}
+    return {"status": "ok", "value": values[0], "raw": raws}
+
+
+def parse_range_field(text: str) -> dict[str, Any]:
+    """Optional author range line 「字数范围：2000-2600」; same status vocabulary as parse_target_field."""
+    raws = _numeric_field_values(normalize_newlines(text).lstrip("\ufeff"), "字数范围")
+    if not raws:
+        return {"status": "missing", "value": None, "raw": raws}
+    matches = [_RANGE_VALUE_RE.fullmatch(raw) for raw in raws]
+    if not all(matches):
+        return {"status": "invalid", "value": None, "raw": raws}
+    values = sorted({(_number(match.group(1)), _number(match.group(2))) for match in matches if match})
+    if len(values) != 1:
+        return {"status": "invalid", "value": None, "raw": raws}
+    low, high = values[0]
+    if low > high:
+        return {"status": "invalid", "value": None, "raw": raws}
+    return {"status": "ok", "value": {"min": low, "max": high}, "raw": raws}
+
+
+def parse_metric_field(text: str) -> dict[str, Any]:
+    """「字数口径：visible_chars_v1（按可见字符）」；每行都得是口径名（可带括号备注），且只能是 METRIC。"""
+    raws = _field_values(normalize_newlines(text).lstrip("\ufeff"), "字数口径")
+    matches = [_METRIC_VALUE_RE.fullmatch(raw) for raw in raws]
+    ok = bool(raws) and all(matches) and {match.group(1) for match in matches if match} == {METRIC}
+    return {"ok": ok, "raw": raws}
 
 
 class WordcountError(ValueError):
@@ -80,8 +143,26 @@ def parse_target(value: Any) -> int:
     return target
 
 
-def compute_wordcount_bands(value: Any) -> dict[str, dict[str, int]]:
+def normalize_author_range(value: Any) -> dict[str, int] | None:
+    """作者明确给出的上下限；None 表示沿用默认 ±12% / ±15% 双层带。"""
+    if value is None:
+        return None
+    require(isinstance(value, dict) and set(value) == {"min", "max"}, "author range must be {min, max}")
+    low, high = value["min"], value["max"]
+    require(
+        all(isinstance(item, int) and not isinstance(item, bool) and item >= 1 for item in (low, high)),
+        "author range bounds must be positive integers",
+    )
+    require(low <= high, "author range min must not exceed max")
+    return {"min": low, "max": high}
+
+
+def compute_wordcount_bands(value: Any, author_range: Any = None) -> dict[str, dict[str, int]]:
     target = parse_target(value)
+    author = normalize_author_range(author_range)
+    if author is not None:
+        # 作者给定区间原样优先：内部带与用户带都取它，不再有 borderline。
+        return {"internal": dict(author), "user": dict(author)}
     return {
         "internal": {"min": (target * 88 + 99) // 100, "max": target * 112 // 100},
         "user": {"min": (target * 85 + 99) // 100, "max": target * 115 // 100},
@@ -95,7 +176,7 @@ def invalid_wordcount_result(
     return {
         "schema": WORDCOUNT_SCHEMA, "metric": METRIC, "chapter": chapter, "case_id": case_id,
         "target": target, "actual": actual, "internal_band": None, "user_band": None,
-        "signed_error_pct": None, "absolute_error_pct": None,
+        "signed_error_pct": None, "absolute_error_pct": None, "band_source": None,
         "status": "invalid", "invalid_reason": reason,
     }
 
@@ -115,19 +196,23 @@ def measure_wordcount(value: str, *, chapter: Any = None, case_id: Any = None) -
 
 
 def evaluate_wordcount(
-    value: str, target_value: Any, *, chapter: Any = None, case_id: Any = None,
+    value: str, target_value: Any, *, chapter: Any = None, case_id: Any = None, author_range: Any = None,
 ) -> dict[str, Any]:
     try:
         target = parse_target(target_value)
     except (TypeError, ValueError):
         return invalid_wordcount_result("INVALID_TARGET", chapter=chapter, case_id=case_id)
+    try:
+        author = normalize_author_range(author_range)
+    except WordcountError:
+        return invalid_wordcount_result("INVALID_RANGE", chapter=chapter, case_id=case_id, target=target)
     try:
         actual = count_visible_chars(value)
     except (TypeError, ValueError):
         return invalid_wordcount_result("INVALID_BODY", chapter=chapter, case_id=case_id, target=target)
     if actual == 0:
         return invalid_wordcount_result("EMPTY_BODY", chapter=chapter, case_id=case_id, target=target, actual=actual)
-    bands = compute_wordcount_bands(target)
+    bands = compute_wordcount_bands(target, author)
     internal_pass = bands["internal"]["min"] <= actual <= bands["internal"]["max"]
     user_pass = bands["user"]["min"] <= actual <= bands["user"]["max"]
     status = "internal_pass" if internal_pass else (
@@ -140,19 +225,22 @@ def evaluate_wordcount(
         "internal_band": {**bands["internal"], "status": "pass" if internal_pass else "fail"},
         "user_band": {**bands["user"], "status": "pass" if user_pass else "fail"},
         "signed_error_pct": signed_error, "absolute_error_pct": abs(signed_error),
+        "band_source": "author" if author else "default",
         "status": status, "invalid_reason": None,
     }
 
 
 def checkpoint_wordcount(
-    value: str, target_value: Any, *, chapter: Any = None, case_id: Any = None,
+    value: str, target_value: Any, *, chapter: Any = None, case_id: Any = None, author_range: Any = None,
 ) -> dict[str, Any]:
     target = parse_target(target_value)
     actual = count_visible_chars(value)
-    user = compute_wordcount_bands(target)["user"]
+    author = normalize_author_range(author_range)
+    user = compute_wordcount_bands(target, author)["user"]
     return {
         "schema": CHECKPOINT_SCHEMA, "metric": METRIC, "chapter": chapter, "case_id": case_id,
         "target": target, "actual": actual, "user_band": user,
+        "band_source": "author" if author else "default",
         "remaining_user_range": {
             "min": max(0, user["min"] - actual),
             "max": max(0, user["max"] - actual),
@@ -160,15 +248,30 @@ def checkpoint_wordcount(
     }
 
 
+_FIELD_ERRORS = {
+    "missing": "is missing",
+    "invalid": "is not a recognizable number (write e.g. 2300 字 / 约 2300 / 2,300)",
+    "conflict": "has conflicting values",
+}
+
+
 def target_from_outline(value: str) -> int:
     text = normalize_newlines(value)
     if text.startswith("\ufeff"):
         text = text[1:]
-    targets = list(dict.fromkeys(_TARGET_LINE_RE.findall(text)))
-    metrics = list(dict.fromkeys(_METRIC_LINE_RE.findall(text)))
-    require(len(targets) == 1, "字数目标 must appear exactly once with one value")
-    require(metrics == [METRIC], f"字数口径 must appear exactly once as {METRIC}")
-    return parse_target(targets[0])
+    parsed = parse_target_field(text)
+    require(parsed["status"] == "ok", f"字数目标 {_FIELD_ERRORS.get(parsed['status'], '')}: {parsed['raw']}")
+    require(parse_metric_field(text)["ok"], f"字数口径 must be {METRIC}")
+    return parse_target(parsed["value"])
+
+
+def range_from_outline(value: str) -> dict[str, int] | None:
+    """细纲可选行「字数范围：2000-2600」；没写返回 None，写了但写不对就报错而不是静默回落默认带。"""
+    parsed = parse_range_field(value)
+    if parsed["status"] == "missing":
+        return None
+    require(parsed["status"] == "ok", f"字数范围 must be one min-max pair with min <= max: {parsed['raw']}")
+    return parsed["value"]
 
 
 def _chapter_number_from_name(name: str, *, outline: bool) -> int | None:
@@ -192,18 +295,40 @@ def find_chapter_file(directory: Path, chapter: int, *, outline: bool) -> Path:
     return matches[0]
 
 
-def build_project_wordcount_record(project: Path, chapter: int, *, resolution: str) -> dict[str, Any]:
+def read_chapter_outline(project: Path, chapter: int) -> tuple[Path, str]:
+    outline_path = find_chapter_file(project.resolve() / "大纲", chapter, outline=True)
+    try:
+        return outline_path, outline_path.read_text(encoding="utf-8")
+    except (OSError, UnicodeError) as exc:
+        raise WordcountError(f"unable to read outline: {exc}") from exc
+
+
+def effective_author_range(outline: str, author_range: Any = None) -> dict[str, int] | None:
+    """命令行给了上下限就以它为准（细纲「字数范围」写错也不阻断）；否则读细纲。"""
+    return normalize_author_range(author_range) if author_range is not None else range_from_outline(outline)
+
+
+def read_project_chapter(
+    project: Path, chapter: int, author_range: Any = None,
+) -> tuple[Path, Path, int, dict[str, int] | None]:
+    """定位本章细纲与正文，读出字数目标和生效的作者字数范围。"""
+    outline_path, outline = read_chapter_outline(project, chapter)
+    body_path = find_chapter_file(project.resolve() / "正文", chapter, outline=False)
+    return outline_path, body_path, target_from_outline(outline), effective_author_range(outline, author_range)
+
+
+def build_project_wordcount_record(
+    project: Path, chapter: int, *, resolution: str, author_range: Any = None,
+) -> dict[str, Any]:
+    """author_range=None 时读细纲「字数范围」；显式传入（命令行 --min-chars/--max-chars）时以它为准。"""
     require(resolution in RESOLUTIONS, f"unsupported wordcount resolution: {resolution}")
-    root = project.resolve()
-    outline_path = find_chapter_file(root / "大纲", chapter, outline=True)
-    body_path = find_chapter_file(root / "正文", chapter, outline=False)
+    _, body_path, target, author = read_project_chapter(project, chapter, author_range)
     try:
-        target = target_from_outline(outline_path.read_text(encoding="utf-8"))
         body_bytes = body_path.read_bytes()
         body = body_bytes.decode("utf-8")
     except (OSError, UnicodeError) as exc:
         raise WordcountError(f"unable to read chapter files: {exc}") from exc
-    result = evaluate_wordcount(body, target, chapter=chapter)
+    result = evaluate_wordcount(body, target, chapter=chapter, author_range=author)
     require(result["status"] != "invalid", f"invalid chapter wordcount: {result['invalid_reason']}")
     in_user_band = result["status"] in {"internal_pass", "borderline"}
     require(
@@ -211,7 +336,7 @@ def build_project_wordcount_record(project: Path, chapter: int, *, resolution: s
         or (resolution == "accepted_current_length" and not in_user_band),
         "wordcount resolution does not match the current length",
     )
-    return {
+    record = {
         "metric": METRIC,
         "target": result["target"],
         "actual": result["actual"],
@@ -219,19 +344,26 @@ def build_project_wordcount_record(project: Path, chapter: int, *, resolution: s
         "resolution": resolution,
         "body_sha256": hashlib.sha256(body_bytes).hexdigest(),
     }
+    if author is not None:
+        record["author_range"] = dict(author)
+    return record
+
+
+_RECORD_FIELDS = {"metric", "target", "actual", "status", "resolution", "body_sha256"}
 
 
 def normalize_wordcount_record(value: object) -> dict[str, Any]:
     require(isinstance(value, dict), "wordcount record must be an object")
     require(
-        set(value) == {"metric", "target", "actual", "status", "resolution", "body_sha256"},
+        set(value) in (_RECORD_FIELDS, _RECORD_FIELDS | {"author_range"}),
         "wordcount record fields are invalid",
     )
     require(value.get("metric") == METRIC, "wordcount metric is unsupported")
     target = parse_target(value.get("target"))
+    author = normalize_author_range(value.get("author_range"))
     actual = value.get("actual")
     require(isinstance(actual, int) and not isinstance(actual, bool) and actual >= 1, "wordcount actual is invalid")
-    expected = evaluate_wordcount("字" * actual, target)
+    expected = evaluate_wordcount("字" * actual, target, author_range=author)
     require(value.get("status") == expected["status"], "wordcount status does not match target and actual")
     resolution = value.get("resolution")
     require(resolution in RESOLUTIONS, "wordcount resolution is unsupported")
@@ -242,8 +374,32 @@ def normalize_wordcount_record(value: object) -> dict[str, Any]:
     return dict(value)
 
 
+def wordcount_record_drift(project: Path, chapter: int, value: object) -> list[str]:
+    """已提交的字数记录对当前文件过期了哪几项：只核对记录钉住的正文字节与字数目标。
+
+    作者事后在细纲补/改「字数范围」只影响下次计数的判定带，不让已提交的记录过期。
+    """
+    record = normalize_wordcount_record(value)
+    root = project.resolve()
+    outline_path = find_chapter_file(root / "大纲", chapter, outline=True)
+    body_path = find_chapter_file(root / "正文", chapter, outline=False)
+    try:
+        outline = outline_path.read_text(encoding="utf-8")
+        body_bytes = body_path.read_bytes()
+    except (OSError, UnicodeError) as exc:
+        raise WordcountError(f"unable to read chapter files: {exc}") from exc
+    drift = []
+    if hashlib.sha256(body_bytes).hexdigest() != record["body_sha256"]:
+        drift.append("正文")
+    if target_from_outline(outline) != record["target"]:
+        drift.append("字数目标")
+    return drift
+
+
 def validate_current_wordcount_record(project: Path, chapter: int, value: object) -> dict[str, Any]:
     record = normalize_wordcount_record(value)
-    current = build_project_wordcount_record(project, chapter, resolution=record["resolution"])
+    current = build_project_wordcount_record(
+        project, chapter, resolution=record["resolution"], author_range=record.get("author_range"),
+    )
     require(record == current, "wordcount record is stale for the current body or target")
     return record