thth 2.7.0__tar.gz → 2.8.0__tar.gz

{thth-2.7.0 → thth-2.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: thth
-Version: 2.7.0
+Version: 2.8.0
 Summary: 承認済みの投稿だけを投げる門（Threads・Bluesky・Mastodon）。人が承認し、記録は利用者の git に残る。
 Project-URL: Homepage, https://thth.me
 Project-URL: Source, https://github.com/aokings/thth

{thth-2.7.0 → thth-2.8.0}/accounts.example/bluesky.json

@@ -14,6 +14,7 @@
   "tick_minutes": 10,
   "collect_days": 14,
   "hashtags": false,
+  "max_hashtags": 3,
   "stale_days": 7,
   "env": "~/.config/thth/demo-bluesky.env",
   "token": "~/.config/thth/demo-bluesky.token",

{thth-2.7.0 → thth-2.8.0}/accounts.example/mastodon.json

@@ -14,6 +14,7 @@
   "tick_minutes": 10,
   "collect_days": 14,
   "hashtags": false,
+  "max_hashtags": 3,
   "stale_days": 7,
   "env": "~/.config/thth/demo-mastodon.env",
   "token": "~/.config/thth/demo-mastodon.token",

{thth-2.7.0 → thth-2.8.0}/mcp/server.py

@@ -160,7 +160,7 @@ TOOLS = [
         "inputSchema": {
             "type": "object",
             "properties": {
-                "by": {"type": "string", "enum": ["kind", "hour_band", "topic"]},
+                "by": {"type": "string", "enum": ["kind", "hour_band", "topic", "tag"]},
                 "compare_previous": {"type": "boolean", "description": "直前の同じ日数との比較（既定false）"},
                 "account": {"type": "string"},
                 "project": {"type": "string"},
@@ -400,8 +400,8 @@ def validate_arguments(name: str, arguments) -> dict:
             f"{name}: arguments は object で渡してください"
             f"（受け取った: {type(arguments).__name__}）")
     if name == "analytics_report" and "by" in arguments:
-        if arguments["by"] not in ("kind", "hour_band", "topic") or arguments.get("compare_previous") is not True:
-            raise ToolInputError("analytics_report: by は compare_previous=true と kind/hour_band/topic が必要です")
+        if arguments["by"] not in ("kind", "hour_band", "topic", "tag") or arguments.get("compare_previous") is not True:
+            raise ToolInputError("analytics_report: by は compare_previous=true と kind/hour_band/topic/tag が必要です")
     if name == "operations_handoff" and "since_last_read" in arguments and type(arguments["since_last_read"]) is not bool:
         raise ToolInputError("operations_handoff: since_last_read は boolean です")
     props = schema.get("properties") or {}

{thth-2.7.0 → thth-2.8.0}/tests/test_analytics_comparison.py

@@ -48,6 +48,27 @@ def test_half_open_zero_delta_and_read_only(isolated_account_factory):
     assert json.loads("\n".join(s[4:] for s in markdown.splitlines() if s.startswith("    "))) == r
 
 
+def test_tag_strata_use_observed_tags_and_suppress_small_samples(isolated_account_factory):
+    a = isolated_account_factory(media="bluesky")
+    seed(a, "old", NOW - datetime.timedelta(days=10), value=5,
+         extra={"tags": ["茶"], "topic": "予定だけの語"})
+    seed(a, "new1", NOW - datetime.timedelta(days=3), value=10,
+         extra={"tags": ["茶", "苦味"], "topic": "予定だけの語"})
+    seed(a, "new2", NOW - datetime.timedelta(days=2), value=20,
+         extra={"tags": ["茶"], "topic": "予定だけの語"})
+    seed(a, "untagged", NOW - datetime.timedelta(days=1, hours=3), value=30,
+         extra={"tags": [], "topic": "予定だけの語"})
+    result = report(a, min_n=2, by="tag")
+    group = result["by_account"][a["name"]]["posts"]["stratified"]
+    assert group["strata"]["tagged"]["current"]["n_total"] == 2
+    assert group["strata"]["untagged"]["current"]["n_total"] == 1
+    assert group["strata"]["#茶"]["current"]["metrics"]["views"]["median"] == 15
+    assert group["strata"]["#苦味"]["current"]["metrics"]["views"]["median"] is None
+    assert group["strata"]["#茶"]["comparison"]["views"]["absolute_median_change"] is None
+    assert "#予定だけの語" not in group["strata"]
+    assert group["reconciliation"]["current"] == {"sum_n_total": 3, "n_total": 3}
+
+
 @pytest.mark.parametrize("age,marks,extra,reason", [
     (23.99, [24], {}, "premature_observation"),
     (30, [24], {}, "late_observation"),

{thth-2.7.0 → thth-2.8.0}/tests/test_bundle.py

@@ -51,6 +51,24 @@ def account_cfg(**over):
     return cfg
 
 
+def test_bluesky_bundle_uses_effective_first_segment_and_preserves_body_tags():
+    fm = FM.replace("nigamilab-threads", "sample-bluesky")
+    body = BODY.replace("## threads", "## bluesky")
+    b = bundle.parse_text(make(fm, body), "b.md")
+    cfg = account_cfg(media="bluesky", hashtags=True)
+    assert not [issue for issue in bundle.check(b, account_cfg=cfg)
+                if not issue.startswith("warning:")]
+    assert bundle.effective_segments(b.segments, cfg, b.get("topic"))[0].endswith(
+        "\n#コーヒー")
+
+
+def test_mastodon_bundle_disabled_topic_has_one_warning():
+    b = bundle.parse_text(make(FM, BODY.replace("## threads", "## mastodon")), "b.md")
+    issues = bundle.check(b, account_cfg=account_cfg(media="mastodon", hashtags=False))
+    assert [issue for issue in issues if "topic が効きません" in issue] == [
+        "warning: 1 段目: この媒体では topic が効きません（hashtags: false）"]
+
+
 # --- v1 を壊さない ---------------------------------------------------------
 
 def test_旧版の解析はthth2を型外にする():

{thth-2.7.0 → thth-2.8.0}/tests/test_collect.py

@@ -89,6 +89,39 @@ def test_刻みを跨いだら1行だけ足す(tmp_path, isolated_account_factor
     assert rows[0]["age_hours"] == 2.0
 
 
+def test_bluesky_observed_tags_are_saved_without_body_or_handle(tmp_path, isolated_account_factory):
+    pair = init_git_pair(tmp_path, seed_content=make_queue_text({
+        "status": "posted", "post_id": "POST1",
+        "posted_at": "2026-09-10T10:00:00+09:00", "topic": "予定だけの語"}))
+    account = isolated_account_factory(repo_dir=pair["work"], production=True,
+                                       media="bluesky")
+    class TaggedAdapter(FakeAdapter):
+        def observed_tags(self, post_id):
+            assert post_id == "POST1"
+            return ["実測の茶"]
+    collect_mod.run_collect(account["name"], adapter=TaggedAdapter(), now=NOW,
+                            log=lambda _line: None)
+    row = _rows(pair["work"], "data/sns/insights/posts/POST1.ndjson")[0]
+    assert row["tags"] == ["実測の茶"]
+    assert row["topic"] == "予定だけの語"  # planned metadata stays separate
+    assert not {"text", "body", "username", "handle"} & row.keys()
+
+
+def test_bluesky_tag_read_failure_is_unknown_not_untagged(tmp_path, isolated_account_factory):
+    pair = init_git_pair(tmp_path, seed_content=make_queue_text({
+        "status": "posted", "post_id": "POST1",
+        "posted_at": "2026-09-10T10:00:00+09:00"}))
+    account = isolated_account_factory(repo_dir=pair["work"], production=True,
+                                       media="bluesky")
+    class BadTaggedAdapter(FakeAdapter):
+        def observed_tags(self, post_id):
+            raise ValueError("malformed record")
+    collect_mod.run_collect(account["name"], adapter=BadTaggedAdapter(), now=NOW,
+                            log=lambda _line: None)
+    row = _rows(pair["work"], "data/sns/insights/posts/POST1.ndjson")[0]
+    assert row["tags"] is None
+
+
 def test_採取時点の所有accountが行に書かれる(tmp_path, isolated_account_factory):
     """外部レビュー再判定 R3・2026-09-12: 台帳の行そのものに、採取時点の所有
     `account` を残す。これが無いと、`thth/measured.py` は「いまの原稿の

{thth-2.7.0 → thth-2.8.0}/tests/test_mastodon_adapter.py

@@ -74,6 +74,7 @@ STATUS_FIXTURE = {
     "favourites_count": 7,
     "replies_count": 3,
     "reblogs_count": 2,
+    "tags": [],  # real Status shape: observed_tags can distinguish empty from missing
     "account": {"id": "9000", "acct": "nigamilab"},
     # 本物の応答は必ず持つ（監査 P2-2）。`fetch_post()`（T1-1）の C-1 検査対象。
     "visibility": "public",

{thth-2.7.0 → thth-2.8.0}/tests/test_select.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 import datetime
 
 from tests.conftest import make_queue_text, parse_verified
-from thth import queuefile, select as select_mod
+from thth import approval, queuefile, select as select_mod
 
 ACCOUNT = "nigamilab-threads"
 NOW = datetime.datetime.fromisoformat("2026-09-09T10:00:00+09:00")
@@ -44,6 +44,19 @@ def select(files, **kwargs):
     return select_mod.select_one(files, **kwargs)
 
 
+def test_bluesky_hashtags_policy_change_stales_old_approval(tmp_path):
+    body = "## bluesky\n本文です。\n"
+    old_sha = approval.compute_approved_sha(
+        section="本文です。", account=ACCOUNT, reply_to=None, topic="茶",
+        publish_at="2026-09-09T08:00:00+09:00")
+    p = write(tmp_path, "bluesky.md", body=body, media="bluesky",
+              fm_overrides={"topic": "茶", "approved_sha": old_sha,
+                            "publish_at": "2026-09-09T08:00:00+09:00"})
+    result = select(parse_all([p]), account_cfg=account_cfg(media="bluesky", hashtags=True))
+    assert result.chosen is None
+    assert any(r.reason == "approval_stale" for r in result.rejections)
+
+
 # 1. post_id が入っている → status より先に落とす（approved に戻されても出ない・§3.5）
 def test_1_post_idがあれば承認済みでも出ない(tmp_path):
     p = write(tmp_path, "a.md", fm_overrides={

{thth-2.7.0 → thth-2.8.0}/tests/test_thread_publish.py

@@ -21,7 +21,7 @@ from pathlib import Path
 import pytest
 
 from tests.conftest import init_git_pair, run_git
-from thth import approval, bundle, inflight, threadrun, threadthrow
+from thth import approval, bundle, cli, inflight, threadrun, threadthrow
 from thth.adapters.base import PublishResult
 
 NOW = datetime.datetime.fromisoformat("2026-09-15T19:00:00+09:00")
@@ -117,6 +117,72 @@ def write_and_push(pair, text):
     run_git(pair["work"], ["push"])
 
 
+def _bluesky_bundle_text(account: str, *, transformed: bool = True,
+                         include_body_tag: bool = True) -> str:
+    segments = ["本文 #苦味" if include_body_tag else "本文", "続きです"]
+    text = bundle_text(account=account, topic="茶", segments=segments).replace(
+        "## threads", "## bluesky")
+    old = approval.compute_bundle_sha(
+        segments=segments, account=account, topic="茶",
+        publish_at="2026-09-15T19:00:00+09:00",
+        continue_until="2026-09-15T20:00:00+09:00")
+    effective = [segments[0] + "\n#茶", "続きです"]
+    new = approval.compute_bundle_sha(
+        segments=effective, account=account, topic="茶",
+        publish_at="2026-09-15T19:00:00+09:00",
+        continue_until="2026-09-15T20:00:00+09:00")
+    assert text.count("approved_sha: " + old) == 1
+    return text.replace("approved_sha: " + old, "approved_sha: " + new) if transformed else text
+
+
+def test_bluesky_bundle_displays_and_publishes_effective_segments(
+        tmp_path, isolated_account_factory):
+    name = "bluesky-bundle"
+    source = _bluesky_bundle_text(name)
+    pair = init_git_pair(tmp_path, seed_content=source, seed_name="thread.md")
+    account = isolated_account_factory(name=name, repo_dir=pair["work"],
+                                       media="bluesky", hashtags=True,
+                                       production=True, quiet_hours=None,
+                                       min_interval_hours=0)
+    path = os.path.join(pair["work"], REL)
+    prepared, error = cli._prepare_bundle(path, source)
+    assert error is None
+    assert prepared["segments"] == ["本文 #苦味\n#茶", "続きです"]
+    adapter = FakeAdapter()
+    results = threadthrow.publish_bundle(name, REL, adapter_factory=lambda *_: adapter,
+                                         now=NOW)
+    assert [r.action for r in results] == ["published", "published"]
+    assert [call["text"] for call in adapter.calls] == prepared["segments"]
+
+
+def test_bluesky_bundle_old_published_segment_stays_frozen_after_policy_change(
+        tmp_path, isolated_account_factory):
+    name = "bluesky-frozen"
+    source = _bluesky_bundle_text(name, transformed=False, include_body_tag=False)
+    pair = init_git_pair(tmp_path, seed_content=source, seed_name="thread.md")
+    account = isolated_account_factory(name=name, repo_dir=pair["work"],
+                                       media="bluesky", hashtags=False,
+                                       production=True, quiet_hours=None,
+                                       min_interval_hours=0)
+    adapter = FakeAdapter()
+    first = threadthrow.publish_bundle(name, REL, adapter_factory=lambda *_: adapter,
+                                       now=NOW, max_posts=1)
+    assert first[0].action == "published"
+    assert adapter.calls[0]["text"] == "本文"
+    ledger = Path(account["accounts_dir"]) / f"{name}.json"
+    cfg = json.loads(ledger.read_text())
+    cfg["hashtags"] = True
+    ledger.write_text(json.dumps(cfg))
+    path = os.path.join(pair["work"], REL)
+    prepared, error = cli._prepare_bundle(path, Path(path).read_text())
+    assert prepared is None
+    assert "公開済みの段の本文は変えられません" in error
+    later = threadthrow.publish_bundle(name, REL, adapter_factory=lambda *_: adapter,
+                                       now=NOW)
+    assert all(r.action != "published" for r in later)
+    assert len(adapter.calls) == 1
+
+
 # --- 正常系 -----------------------------------------------------------------
 
 def test_束を順に出して親子がつながる(thread_account):

thth-2.8.0/tests/test_v28_tags.py

@@ -0,0 +1,247 @@
+"""2.8.0 tag contracts against local fixtures only."""
+from __future__ import annotations
+
+import json
+
+import pytest
+
+from thth import approval, cli, lint, tags
+from thth.adapters import base, bluesky, mastodon
+from tests.test_bluesky_adapter import _adapter, fake_bluesky
+
+
+def test_topic_is_the_same_sent_text_and_utf8_facet():
+    text = "日本語の本文"
+    with fake_bluesky() as service:
+        post = base.Post(text=text, topic="苦味", hashtags_allowed=True)
+        result = _adapter(service).publish(post, dry_run=False)
+        record = service.handler_cls.created[0]["payload"]["record"]
+    assert result.error is None
+    assert record["text"] == tags.prepared("bluesky", text, "苦味", hashtags=True)
+    facet = next(f for f in record["facets"] if f["features"][0]["$type"].endswith("#tag"))
+    assert facet["features"] == [{"$type": "app.bsky.richtext.facet#tag", "tag": "苦味"}]
+    index = facet["index"]
+    assert record["text"].encode("utf-8")[index["byteStart"]:index["byteEnd"]] == "#苦味".encode("utf-8")
+    assert index["byteStart"] == len((text + "\n").encode("utf-8"))
+
+
+def test_topic_already_present_is_not_appended_twice():
+    text = "#苦味 の話"
+    assert tags.prepared("bluesky", text, "苦味", hashtags=True) == text
+    facet = bluesky.build_facets(text, topic="苦味")[0]
+    assert facet["index"] == {"byteStart": 0, "byteEnd": len("#苦味".encode())}
+
+
+def test_all_body_tags_have_non_overlapping_byte_facets():
+    text = "日本語 #苦味 と #旨味 https://example.invalid/#url_fragment"
+    facets = bluesky.build_facets(text, include_tags=True)
+    tags_found = [f for f in facets if f["features"][0]["$type"].endswith("#tag")]
+    assert [f["features"][0]["tag"] for f in tags_found] == ["苦味", "旨味"]
+    for facet, wanted in zip(tags_found, ("#苦味", "#旨味")):
+        index = facet["index"]
+        assert text.encode()[index["byteStart"]:index["byteEnd"]] == wanted.encode()
+    assert len(facets) == 3  # one URL link, two tags
+
+
+def test_url_fragment_does_not_suppress_topic_append():
+    text = "記事 https://example.invalid/#個人開発"
+    effective = tags.prepared("bluesky", text, "個人開発", hashtags=True)
+    assert effective.endswith("\n#個人開発")
+    facets = bluesky.build_facets(effective, topic="個人開発", include_tags=True)
+    tag_facets = [f for f in facets if f["features"][0]["$type"].endswith("#tag")]
+    assert len(tag_facets) == 1
+    assert effective.encode()[tag_facets[0]["index"]["byteStart"]:] == "#個人開発".encode()
+
+
+def test_punctuation_topic_and_combining_mark_are_single_facets():
+    text = "#a.b と #か\u3099"
+    assert tags.prepared("bluesky", text, "a.b", hashtags=True) == text
+    facets = bluesky.build_facets(text, topic="a.b", include_tags=True)
+    tag_facets = [f for f in facets if f["features"][0]["$type"].endswith("#tag")]
+    assert [f["features"][0]["tag"] for f in tag_facets] == ["a.b", "か\u3099"]
+    assert tags.topic_error("bluesky", "あ" * 64) is None
+    assert tags.topic_error("bluesky", "あ" * 65) == "topic_too_long(65)"
+
+
+def test_emoji_and_internal_punctuation_are_real_bluesky_tags():
+    text = "#🍵 #a.b #茶 #苦味"
+    facets = bluesky.build_facets(text, include_tags=True)
+    assert [f["features"][0]["tag"] for f in facets] == ["🍵", "a.b", "茶", "苦味"]
+    assert "上限 3 個" in tags.errors("bluesky", text, None, {"hashtags": True})[0]
+    assert tags.prepared("bluesky", "本文 #a.b", "a.b", hashtags=True) == "本文 #a.b"
+
+
+def test_topic_prefix_does_not_relabel_longer_punctuation_tag():
+    effective = tags.prepared("bluesky", "#a.b", "a", hashtags=True)
+    assert effective == "#a.b\n#a"
+    facets = bluesky.build_facets(effective, topic="a", include_tags=True)
+    assert [f["features"][0]["tag"] for f in facets] == ["a.b", "a"]
+    assert tags.prepared("bluesky", "#茶.味", "茶", hashtags=True) == "#茶.味\n#茶"
+    bracketed = tags.prepared("bluesky", "(#a.b)", "a", hashtags=True)
+    assert bracketed == "(#a.b)\n#a"
+    facets = bluesky.build_facets(bracketed, topic="a", include_tags=True)
+    assert [f["features"][0]["tag"] for f in facets] == ["a.b", "a"]
+    assert tags.prepared("bluesky", "「#茶.味」", "茶", hashtags=True).endswith("\n#茶")
+
+
+def test_mastodon_number_only_topic_is_rejected():
+    assert tags.topic_error("mastodon", "123") is not None
+
+
+def test_mastodon_topic_uses_one_final_line(monkeypatch):
+    seen = []
+    adapter = mastodon.MastodonAdapter(instance="https://example.invalid", access_token="fixture")
+    monkeypatch.setattr(adapter, "_request", lambda method, path, **kwargs: seen.append(kwargs) or
+                        {"id": "123", "url": "https://example.invalid/@u/123"})
+    result = adapter.publish(base.Post(text="本文", topic="茶", hashtags_allowed=True), dry_run=False)
+    assert result.error is None
+    assert seen[0]["data"]["status"] == "本文\n#茶"
+
+
+def test_topic_false_warns_and_does_not_append():
+    assert tags.prepared("bluesky", "本文", "茶", hashtags=False) == "本文"
+    assert tags.errors("bluesky", "本文", "茶", {"hashtags": False}) == [
+        "warning: この媒体では topic が効きません（hashtags: false）"]
+
+
+def test_topic_limit_and_length_include_appended_tag(tmp_path, monkeypatch):
+    path = tmp_path / "draft.md"
+    path.write_text("---\nthth: 1\naccount: sample\npublish_at: 2026-09-20T09:00:00+09:00\n"
+                    "topic: 苦味\n---\n## bluesky\n" + "あ" * 298)
+    monkeypatch.setattr(lint, "_account_cfg_or_none", lambda _: {"media": "bluesky", "hashtags": True})
+    assert any("length:" in error for error in lint.lint_file(str(path)))
+    assert lint.preview_file(str(path)).endswith("\n#苦味")
+    assert tags.topic_error("bluesky", "あ" * 65) == "topic_too_long(65)"
+    assert tags.topic_error("mastodon", "two words") is not None
+    assert tags.errors("bluesky", "🫠" * 800, None, {"hashtags": True})[0].startswith("length:")
+    path.write_text(path.read_text().replace("あ" * 298, "本文"))
+    monkeypatch.setattr(cli.accounts_mod, "load_account", lambda _: {"media": "bluesky", "hashtags": True})
+    one, error = cli._prepare_one(str(path))
+    assert error is None
+    assert one["text"] == lint.preview_file(str(path))
+    assert one["text"].endswith("\n#苦味")
+    assert one["approved_sha"] == approval.compute_approved_sha(
+        section=one["text"], account="sample", reply_to=None, topic="苦味",
+        publish_at="2026-09-20T09:00:00+09:00", location_id=None,
+        share_to_instagram=False)
+    monkeypatch.setattr(cli.accounts_mod, "load_account", lambda _: {"media": "bluesky", "hashtags": False})
+    without, error = cli._prepare_one(str(path))
+    assert error is None
+    assert without["text"] == "本文"
+    assert without["approved_sha"] != one["approved_sha"]
+
+
+def test_max_hashtags_counts_topic_and_body_with_default_three():
+    assert not tags.errors("bluesky", "#茶 #珈琲", "苦味", {"hashtags": True})
+    assert "上限 3 個" in tags.errors(
+        "bluesky", "#茶 #珈琲 #山菜", "苦味", {"hashtags": True})[0]
+    assert "上限 1 個" in tags.errors(
+        "mastodon", "#茶", "苦味", {"hashtags": True, "max_hashtags": 1})[0]
+    assert tags.errors("bluesky", "本文", None,
+                       {"hashtags": True, "max_hashtags": True}) == [
+                           "max_hashtags: 0 以上の整数にしてください"]
+
+
+def test_tag_limits_do_not_treat_url_fragment_as_a_hashtag():
+    text = "https://example.invalid/#url #茶"
+    assert not tags.errors("bluesky", text, None,
+                           {"hashtags": True, "max_hashtags": 1})
+    assert "タグが Bluesky 上限" in tags.errors(
+        "bluesky", "#" + "あ" * 65, None, {"hashtags": True})[0]
+
+
+def test_bluesky_tag_search_paginates_and_keeps_only_aggregates(monkeypatch):
+    adapter = bluesky.BlueskyAdapter(identifier="fixture", app_password="fixture")
+    calls = []
+    pages = [
+        {"posts": [
+            {"uri": "at://one", "author": {"did": "did:a", "handle": "secret-user"},
+             "record": {"text": "secret-body", "createdAt": "2026-09-19T01:00:00Z",
+                        "facets": [{"features": [{"$type": "app.bsky.richtext.facet#tag", "tag": "茶"},
+                                                  {"$type": "app.bsky.richtext.facet#tag", "tag": "苦味"}]}]}},
+            {"uri": "at://two", "author": {"did": "did:a", "handle": "secret-user"},
+             "record": {"text": "secret-body", "createdAt": "2026-09-19T02:00:00Z",
+                        "tags": ["茶", "旨味"]}}], "cursor": "next"},
+        {"posts": [{"uri": "at://two"},
+                   {"uri": "at://three", "author": {"did": "did:b", "handle": "secret-user"},
+                    "record": {"text": "secret-body", "tags": ["茶", "苦味"]}}]},
+    ]
+    def get(method, nsid, *, params):
+        calls.append(params)
+        return pages[len(calls) - 1]
+    monkeypatch.setattr(adapter, "_request", get)
+    result = adapter.tag_search("茶", tags=["茶"], sort="latest", pages=4,
+                                since="2026-09-18", until="2026-09-20")
+    assert calls[0] == {"q": "茶", "tag": ["茶"], "sort": "latest", "limit": 100,
+                        "since": "2026-09-18", "until": "2026-09-20"}
+    assert calls[1]["cursor"] == "next"
+    assert result["n"] == 3 and result["distinct_authors"] == 2
+    assert result["tagged_n"] == 3 and result["tagged_share"] == 1
+    assert result["co_tags"] == [{"tag": "苦味", "n": 2}, {"tag": "旨味", "n": 1}]
+    serialized = json.dumps(result, ensure_ascii=False)
+    assert "secret-body" not in serialized and "secret-user" not in serialized
+    with pytest.raises(Exception, match="q は空"):
+        adapter.tag_search("", tags=["茶"])
+
+
+def test_bluesky_latest_at_compares_instants(monkeypatch):
+    adapter = bluesky.BlueskyAdapter(identifier="fixture", app_password="fixture")
+    monkeypatch.setattr(adapter, "_request", lambda *args, **kwargs: {"posts": [
+        {"uri": "at://one", "record": {"createdAt": "2026-09-19T09:00:00+09:00"}},
+        {"uri": "at://two", "record": {"createdAt": "2026-09-19T01:00:00Z"}},
+    ]})
+    assert adapter.tag_search("茶", tags=["茶"])["latest_at"] == "2026-09-19T01:00:00Z"
+
+
+@pytest.mark.parametrize("record", [None, {"tags": "broken"}, {"facets": "broken"}])
+def test_bluesky_missing_or_malformed_record_is_unknown_not_untagged(monkeypatch, record):
+    adapter = bluesky.BlueskyAdapter(identifier="fixture", app_password="fixture")
+    monkeypatch.setattr(adapter, "_post_view", lambda _: {"record": record})
+    with pytest.raises(base.AdapterError, match="投稿のタグ"):
+        adapter.observed_tags("at://fake")
+    monkeypatch.setattr(adapter, "_post_view", lambda _: {"record": {}})
+    assert adapter.observed_tags("at://fake") == []
+
+
+def test_mastodon_tag_observation_is_instance_scoped_and_aggregate(monkeypatch):
+    adapter = mastodon.MastodonAdapter(instance="https://instance.example", access_token="fixture")
+    requested = []
+    def get_list(path, what):
+        requested.append(path)
+        if "/timelines/tag/" in path:
+            return [{"id": "1", "visibility": "public", "content": "secret-body",
+                     "created_at": "2026-09-19T01:00:00Z",
+                     "account": {"id": "a", "acct": "secret-user"},
+                     "tags": [{"name": "茶"}, {"name": "苦味"}]},
+                    {"id": "2", "visibility": "private", "content": "secret-body"}]
+        return [{"name": "茶", "history": [{"day": "1789776000", "uses": "7",
+                                                "accounts": "4"}]}]
+    def get_json(path, what):
+        requested.append(path)
+        return {"hashtags": [{"name": "茶", "history": []},
+                              {"name": "茶道", "history": []}]}
+    monkeypatch.setattr(adapter, "_get_list", get_list)
+    monkeypatch.setattr(adapter, "_get_json", get_json)
+    result = adapter.tag_observation("茶")
+    assert any("/api/v1/timelines/tag/%E8%8C%B6" in path for path in requested)
+    assert any("type=hashtags" in path for path in requested)
+    assert any("/api/v1/trends/tags" in path for path in requested)
+    assert result["n"] == result["distinct_authors"] == 1
+    assert result["co_tags"] == [{"tag": "苦味", "n": 1}]
+    assert result["history"] == [{"day": "1789776000", "uses": 7, "accounts": 4}]
+    assert result["observed_from"] == "https://instance.example"
+    serialized = json.dumps(result, ensure_ascii=False)
+    assert "secret-body" not in serialized and "secret-user" not in serialized
+
+
+def test_mastodon_bad_created_at_and_timezone_order(monkeypatch):
+    adapter = mastodon.MastodonAdapter(instance="https://instance.example", access_token="fixture")
+    monkeypatch.setattr(adapter, "_get_list", lambda path, what: [
+        {"visibility": "public", "created_at": ["bad"]},
+        {"visibility": "public", "created_at": "2026-09-19T09:00:00+09:00"},
+        {"visibility": "public", "created_at": "2026-09-19T01:00:00Z"},
+    ] if "timeline" in path else [])
+    monkeypatch.setattr(adapter, "_get_json", lambda *args: {"hashtags": []})
+    result = adapter.tag_observation("茶", since="2026-09-19T00:00:00Z")
+    assert result["n"] == 2
+    assert result["latest_at"] == "2026-09-19T01:00:00Z"

{thth-2.7.0 → thth-2.8.0}/tests/test_where_cli.py

@@ -127,7 +127,7 @@ def test_2媒体をproject単位で並べる(two_media_project):
     # **トップレベルに数が無い**（設計「自分の泉」§2.6・T2-2 規約）。
     assert "n" not in result
     assert set(result.keys()) == {"account", "project", "words", "by_account",
-                                  "cannot_say", "provenance"}
+                                  "by_tag", "cannot_say", "provenance"}
 
     by_account = result["by_account"]
     assert set(by_account) == {threads_acc["name"], bluesky_acc["name"]}
@@ -139,6 +139,12 @@ def test_2媒体をproject単位で並べる(two_media_project):
     bluesky_node = by_account[bluesky_acc["name"]]
     assert bluesky_node["medium"] == "bluesky"
     assert set(bluesky_node["by_word"]) == {"コーヒー", "苦い"}
+    assert [item["tag"] for item in bluesky_node["by_tag"]] == ["コーヒー", "苦い"]
+    assert len(result["by_tag"]) == 2
+    assert all(item["n"] == 1 and item["observed_from"] for item in result["by_tag"])
+    tag_json = json.dumps(result["by_tag"], ensure_ascii=False)
+    assert "苦いコーヒーの話" not in tag_json
+    assert BSKY_BOB_HANDLE not in tag_json
 
     # posts に author_key。
     t_posts = threads_node["by_word"]["コーヒー"]["posts"]

thth-2.8.0/thth/VERSION

@@ -0,0 +1 @@
+2.8.0

{thth-2.7.0 → thth-2.8.0}/thth/adapters/base.py

@@ -29,6 +29,7 @@ class Post:
     # 壊さないため——ここで loud に断ると、媒体を足した瞬間に既存の queue が
     # 全部止まる。**使わない媒体が受け取っても何も起きない**が正しい。
     topic: str | None = None
+    hashtags_allowed: bool = False
     # --- 承認を通る書き込みの口（設計 v2 §4.3・v2.1-B・2026-09-14） ---
     # 場所（Threads の `location_id`）。queue の front-matter `location:`（人が
     # 書く語）と `location_id:`（`thth location search` が引いた id を人が書く）