thth 2.3.0__tar.gz → 2.3.1__tar.gz

{thth-2.3.0 → thth-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: thth
-Version: 2.3.0
+Version: 2.3.1
 Summary: 承認済みの投稿だけを投げる門（Threads・Bluesky・Mastodon）。人が承認し、記録は利用者の git に残る。
 Project-URL: Homepage, https://thth.me
 Project-URL: Source, https://github.com/aokings/thth
@@ -45,7 +45,7 @@ watchtower（`~/Developer/watchtower`）の隣に同じ流儀で並べる。watc
 
 ## いまの状態（2026-09-13）
 
-版 **2.3.0**。全件テスト **2274 件**（`python -m pytest tests/ -q -n auto -p no:cacheprovider`・1 skip・rc=0）。
+版 **2.3.1**。全件テスト **2287 件**（`python -m pytest tests/ -q -n auto -p no:cacheprovider`・1 skip・rc=0）。
 
 **媒体**: Threads（稼働）・Bluesky・Mastodon（同席用の台帳あり・未稼働）。
 

{thth-2.3.0 → thth-2.3.1}/README.md

@@ -21,7 +21,7 @@ watchtower（`~/Developer/watchtower`）の隣に同じ流儀で並べる。watc
 
 ## いまの状態（2026-09-13）
 
-版 **2.3.0**。全件テスト **2274 件**（`python -m pytest tests/ -q -n auto -p no:cacheprovider`・1 skip・rc=0）。
+版 **2.3.1**。全件テスト **2287 件**（`python -m pytest tests/ -q -n auto -p no:cacheprovider`・1 skip・rc=0）。
 
 **媒体**: Threads（稼働）・Bluesky・Mastodon（同席用の台帳あり・未稼働）。
 

{thth-2.3.0 → thth-2.3.1}/mcp/server.py

@@ -180,7 +180,17 @@ TOOLS = [
             "type": "object",
             "properties": {
                 "account": {"type": "string", "description": "account 名"},
-                "post_id": {"type": "string", "description": "枝の根の post_id"},
+                "post_id": {
+                    "type": "string",
+                    "description": (
+                        "枝の根の post_id。各 message の already_replied は"
+                        " 3 値（T7-3）: object（source 付き。ledger＝絡みの台帳／"
+                        "queue＝queue の下書き／thread＝枝の中の自分の返信）＝返した"
+                        "／false＝台帳・queue・枝のどこにも見当たらない"
+                        "（「返していない」の確定ではない）"
+                        "／null＝台帳か queue が読めず判らない"
+                        "（理由は provenance.ledgers_unreadable）"),
+                },
                 "since": {"type": "string", "description": "この時刻以降だけ"},
                 "max_messages": {"type": "integer",
                                    "description": "読む上限（既定 200・上限 1000）"},

{thth-2.3.0 → thth-2.3.1}/tests/test_adapter_boundary.py

@@ -204,6 +204,55 @@ def test_TB0_conversationはmediumとauthor_keyを足すが既存の鍵は変え
     assert row["author_key"] == adapter_base.author_key("threads", "someone")
 
 
+# --- T7-1: normalize_message() ----------------------------------------------
+# `thth/thread_read.py`が`conversation()`・`fetch_post()`の生の行を読む直前に
+# 通す変換（設計「自分の泉」§2.1）。**`conversation()`自身は変えない**——ここは
+# 変換の単体テストだけ（`thread_read`側の配線は`tests/test_thread_read.py`）。
+
+
+def test_T71_normalize_messageはidをmessage_idに写しreplied_toのdictをidに開く():
+    row = {"id": "R1", "username": "someone", "text": "やあ",
+           "timestamp": "2026-09-12T10:00:00+0000",
+           "replied_to": {"id": "P1"}, "root_post": {"id": "P0"}}
+    out = adapter_base.normalize_message(row, medium="threads")
+    assert out["message_id"] == "R1"
+    assert out["replied_to"] == "P1"
+    assert out["root_post"] == "P0"
+    assert out["author_key"] == adapter_base.author_key("threads", "someone")
+    # 他の鍵はそのまま素通し。
+    assert out["text"] == "やあ" and out["timestamp"] == "2026-09-12T10:00:00+0000"
+    # 元の行は書き換えない（コピーを返す）。
+    assert "message_id" not in row
+
+
+def test_T71_normalize_messageはreplied_toが文字列ならそのまま無ければNoneのまま():
+    already_str = adapter_base.normalize_message(
+        {"message_id": "R2", "username": "u", "replied_to": "P1", "root_post": "P1"},
+        medium="bluesky")
+    assert already_str["replied_to"] == "P1" and already_str["root_post"] == "P1"
+
+    無し = adapter_base.normalize_message(
+        {"id": "R3", "username": "u"}, medium="mastodon")
+    assert 無し.get("replied_to") is None and 無し.get("root_post") is None
+    assert 無し["message_id"] == "R3"
+
+
+def test_T71_normalize_messageは既にmessage_idやauthor_keyがあれば変えない():
+    already = {"message_id": "R4", "id": "RAW4", "username": "someone",
+              "author_key": "0" * 16, "replied_to": {"id": "P1"}}
+    out = adapter_base.normalize_message(already, medium="threads")
+    assert out["message_id"] == "R4"       # `id` ではなく既存の値のまま
+    assert out["author_key"] == "0" * 16   # 上書きしない
+
+
+def test_T71_normalize_messageは冪等():
+    row = {"id": "R5", "username": "someone", "replied_to": {"id": "P1"},
+           "root_post": {"id": "P1"}}
+    once = adapter_base.normalize_message(row, medium="threads")
+    twice = adapter_base.normalize_message(once, medium="threads")
+    assert once == twice
+
+
 def _select_1件(tmp_path, *, media: str, topic: str, char_limit=None):
     """`select` に 1 本だけ流して、落ちた理由を返す（時刻の関門より手前を見る）。"""
     path = tmp_path / "a.md"

{thth-2.3.0 → thth-2.3.1}/tests/test_engagements.py

@@ -21,6 +21,7 @@ from thth import accounts as accounts_mod
 from thth import core
 from thth import engagements as engagements_mod
 from thth import lint as lint_mod
+from thth import runs as runs_mod
 
 
 def _row(**over):
@@ -151,6 +152,46 @@ def test_c_reply_to付きの原稿を出すと台帳に1行_author_keyも写る(
         assert forbidden not in row, row
 
 
+# --- T7-2: queue の門（`_throw_chosen`）も best-effort に `fetch_post` を試す ---
+# kopicha の実物の所見が挙げた「queue の門でも同じ best-effort を入れる」の側。
+# `fake_threads_server`（`tests/test_fake_api.py`）は POST しか持たない偽サーバ
+# なので、`fetch_post()` の `GET /v1.0/<reply_to>` は 501 になる——「読めなかった」
+# を自然に再現できる（`AdapterError` に化けて `author_key` は `None` のまま・
+# 公開は止まらない）。
+
+
+def test_c_reply_to_author_key省略でもfetch_postをbesteffortに試し失敗してもauthor_keyはnullのまま(
+        isolated_account_factory):
+    account = isolated_account_factory(production=True)
+    text = make_queue_text(fm_overrides={"reply_to": "THIRDPARTY777", "topic": None})
+    os.makedirs(account["queue_dir"], exist_ok=True)
+    path = os.path.join(account["queue_dir"], "with-reply-no-key.md")
+    with open(path, "w", encoding="utf-8") as f:
+        f.write(text)
+    commit_and_push_path(path, message="test: with-reply-no-key")
+
+    with fake_threads_server({"create": "ok", "publish": "ok"}) as base_url:
+        def factory(_cfg, _token):
+            return _adapter(base_url)
+
+        result = core.throw_once(account["name"], production_flag=True,
+                                  adapter_factory=factory, now=NOW)
+
+    assert result.exit_code == 0 and result.action == "post", result
+    cfg = accounts_mod.load_account(account["name"])
+    rows = engagements_mod.records(cfg, account["name"])
+    assert len(rows) == 1, rows
+    assert rows[0]["author_key"] is None   # 偽サーバに GET が無いので best-effort は失敗する
+    assert rows[0]["reply_to"] == "THIRDPARTY777"
+
+    state_dir = accounts_mod.state_dir_for(account["name"])
+    run_rows = [r for r in runs_mod.read_runs(state_dir) if r.get("post_id") == result.post_id]
+    assert len(run_rows) == 1, run_rows
+    assert run_rows[0]["status"] == "ok"
+    assert run_rows[0]["engagement_write_failed"] is False
+    assert run_rows[0]["engagement_author_lookup_failed"] is True
+
+
 def test_c_reply_to無しなら0行(isolated_account_factory):
     account = isolated_account_factory(production=True)
     write_queue_file(account["queue_dir"], "no-reply.md")

{thth-2.3.0 → thth-2.3.1}/tests/test_send.py

@@ -11,7 +11,10 @@ import os
 from thth import accounts as accounts_mod
 from thth import approval as approval_mod
 from thth import core
+from thth import engagements as engagements_mod
 from thth import inflight as inflight_mod
+from thth import runs as runs_mod
+from thth.adapters import base as adapter_base
 
 
 def _digest_for(account_name: str, text: str, *, reply_to=None, topic=None) -> str:
@@ -136,3 +139,114 @@ def test_inflightが残っていれば何もしない(isolated_account_factory):
     r = core.send_once(account["name"], text="本文", production_flag=True,
                        adapter_factory=lambda *_: _Spy())
     assert r.exit_code == 1 and r.action == "inflight"
+
+
+# --- T7-2: `send --reply-to` も絡みの台帳に 1 行書く（設計「自分の泉」§4） --------
+# kopicha の実物の所見: `_throw_chosen()`（queue の門）は絡みの台帳に書くが、
+# 同席の様態（`send_once()`）には配線が無く、`thth send --reply-to <id>` で
+# 出した返信は台帳に残らなかった。
+
+
+class _SpyWithFetch:
+    """`publish()` に加えて `fetch_post()` を持つ偽アダプタ（T7-2）。
+
+    `reply_to_author_key` を渡さないときの best-effort 経路を確かめる。
+    """
+
+    def __init__(self, *, fetch_row=None, fetch_error=None):
+        self.fetch_calls: list = []
+        self._fetch_row = fetch_row
+        self._fetch_error = fetch_error
+
+    def publish(self, post, *, dry_run, on_container_created=None):
+        return adapter_base.PublishResult(
+            post_id="ENG1", url=None, ts="2026-09-16T10:00:00+09:00")
+
+    def fetch_post(self, post_id):
+        self.fetch_calls.append(post_id)
+        if self._fetch_error is not None:
+            raise self._fetch_error
+        return self._fetch_row
+
+
+def test_replyToがあれば絡みの台帳に1行書く_author_keyは明示した値を使う(isolated_account_factory):
+    account = isolated_account_factory(production=True)
+    cfg = accounts_mod.load_account(account["name"])
+    spy = _SpyWithFetch()
+    digest = _digest_for(account["name"], "返信です", reply_to="R1")
+    r = core.send_once(
+        account["name"], text="返信です", reply_to="R1", reply_to_root="ROOT1",
+        reply_to_author_key="a" * 16, found_by="manual",
+        production_flag=True, confirm=digest, adapter_factory=lambda *_: spy)
+    assert r.exit_code == 0 and r.post_id == "ENG1"
+
+    # 明示した author_key があるので fetch_post は best-effort でも叩かない。
+    assert spy.fetch_calls == []
+
+    rows = engagements_mod.records(cfg, account["name"])
+    assert len(rows) == 1, rows
+    row = rows[0]
+    assert row["post_id"] == "ENG1" and row["reply_to"] == "R1"
+    assert row["root_post"] == "ROOT1"
+    assert row["author_key"] == "a" * 16
+    assert row["found_by"] == "manual"
+    assert row["account"] == account["name"] and row["medium"] == "threads"
+
+
+def test_reply_to_author_keyが無ければfetch_postでbesteffortに埋める(isolated_account_factory):
+    account = isolated_account_factory(production=True)
+    cfg = accounts_mod.load_account(account["name"])
+    expected_key = adapter_base.author_key("threads", "someone")
+    spy = _SpyWithFetch(fetch_row={"message_id": "R1", "username": "someone",
+                                   "author_key": expected_key})
+    digest = _digest_for(account["name"], "返信です", reply_to="R1")
+    r = core.send_once(
+        account["name"], text="返信です", reply_to="R1",
+        production_flag=True, confirm=digest, adapter_factory=lambda *_: spy)
+    assert r.exit_code == 0
+    assert spy.fetch_calls == ["R1"]   # 1 回だけ叩く
+
+    rows = engagements_mod.records(cfg, account["name"])
+    assert len(rows) == 1
+    assert rows[0]["author_key"] == expected_key
+    # best-effort が成功しているので、runs に失敗の印は立たない。
+    state_dir = accounts_mod.state_dir_for(account["name"])
+    run_rows = [r for r in runs_mod.read_runs(state_dir) if r.get("post_id") == "ENG1"]
+    assert len(run_rows) == 1
+    assert run_rows[0]["engagement_write_failed"] is False
+    assert run_rows[0]["engagement_author_lookup_failed"] is False
+
+
+def test_fetch_postが失敗してもauthor_keyがnullになるだけで公開は成功する(isolated_account_factory):
+    account = isolated_account_factory(production=True)
+    cfg = accounts_mod.load_account(account["name"])
+    spy = _SpyWithFetch(fetch_error=adapter_base.AdapterError("投稿の取得: HTTP 400 不明"))
+    digest = _digest_for(account["name"], "返信です", reply_to="R1")
+    r = core.send_once(
+        account["name"], text="返信です", reply_to="R1",
+        production_flag=True, confirm=digest, adapter_factory=lambda *_: spy)
+    assert r.exit_code == 0, "author_key が埋まらなくても公開は止めない"
+    assert spy.fetch_calls == ["R1"]
+
+    rows = engagements_mod.records(cfg, account["name"])
+    assert len(rows) == 1
+    assert rows[0]["author_key"] is None   # 「見当たらない」であって公開の失敗ではない
+
+    state_dir = accounts_mod.state_dir_for(account["name"])
+    run_rows = [r for r in runs_mod.read_runs(state_dir) if r.get("post_id") == "ENG1"]
+    assert len(run_rows) == 1
+    assert run_rows[0]["status"] == "ok"
+    assert run_rows[0]["engagement_write_failed"] is False
+    assert run_rows[0]["engagement_author_lookup_failed"] is True
+
+
+def test_reply_toが無ければ絡みの台帳には何も書かない(isolated_account_factory):
+    account = isolated_account_factory(production=True)
+    cfg = accounts_mod.load_account(account["name"])
+    spy = _SpyWithFetch()
+    digest = _digest_for(account["name"], "独り言です")
+    r = core.send_once(account["name"], text="独り言です",
+                       production_flag=True, confirm=digest, adapter_factory=lambda *_: spy)
+    assert r.exit_code == 0
+    assert spy.fetch_calls == []
+    assert engagements_mod.records(cfg, account["name"]) == []

{thth-2.3.0 → thth-2.3.1}/tests/test_send_cli.py

@@ -7,6 +7,7 @@
 """
 from __future__ import annotations
 
+import json
 import re
 
 from tests.conftest import run_thth
@@ -58,3 +59,52 @@ def test_違うconfirmの本番は拒否される(isolated_account_factory, tmp_
             ["send", account["name"], "--text-file", str(text_path),
              "--production", "--confirm", "0" * 12], env=env)
     assert prod.returncode == 1
+
+
+# --- T7-2: `send --reply-to` が絡みの台帳に残り、`after`・`who` から拾える -------
+# kopicha の実物の所見: `thth send --reply-to <id>` で出した返信が絡みの台帳に
+# 残らず、`after --reply-to`・`who` の「→」が埋まらなかった。偽 Threads（POST
+# だけの `fake_threads_server`）越しに実際に送り、ディスク上の台帳・`thth after`・
+# `thth who` で拾えることを end-to-end で確かめる。
+
+REPLY_TO_ID = "R1"
+REPLY_ROOT_ID = "ROOT1"
+REPLY_AUTHOR_KEY = "b" * 16
+
+
+def test_replyToで送るとafterとwhoで拾える(isolated_account_factory, tmp_path):
+    account = isolated_account_factory(production=True)
+    text_path = tmp_path / "body.txt"
+    text_path.write_text("お返事です\n", encoding="utf-8")
+
+    dry = run_thth(["send", account["name"], "--text-file", str(text_path),
+                    "--reply-to", REPLY_TO_ID])
+    assert dry.returncode == 0
+    m = re.search(r"digest: (\S+)", dry.stdout)
+    assert m is not None
+    digest = m.group(1)
+
+    with fake_threads_server({"create": "ok", "publish": "ok"}) as base_url:
+        env = {"THTH_THREADS_BASE_URL": base_url, "THTH_THREADS_WAIT_SECONDS": "0"}
+        prod = run_thth(
+            ["send", account["name"], "--text-file", str(text_path),
+             "--reply-to", REPLY_TO_ID, "--reply-to-root", REPLY_ROOT_ID,
+             "--reply-to-author-key", REPLY_AUTHOR_KEY, "--found-by", "manual",
+             "--production", "--confirm", digest], env=env)
+    assert prod.returncode == 0, prod.stdout + prod.stderr
+    assert "投稿しました" in prod.stdout
+
+    after = run_thth(["after", account["name"], "--reply-to", REPLY_TO_ID, "--json"])
+    assert after.returncode == 0, after.stdout + after.stderr
+    payload = json.loads(after.stdout)
+    assert payload["engagements"]["n"] == 1
+    branch = payload["engagements"]["by_branch"][0]
+    assert branch["reply_to"] == REPLY_TO_ID
+    assert branch["root"] == REPLY_ROOT_ID
+    assert branch["author_key"] == REPLY_AUTHOR_KEY
+
+    who = run_thth(["who", account["name"], REPLY_AUTHOR_KEY, "--json"])
+    assert who.returncode == 0, who.stdout + who.stderr
+    who_payload = json.loads(who.stdout)
+    roles = [t["role"] for t in who_payload["threads"]]
+    assert "i_replied_to_them" in roles, who_payload

{thth-2.3.0 → thth-2.3.1}/tests/test_thread_read.py

@@ -185,13 +185,67 @@ def test_already_repliedは絡みの台帳とqueueの両方から引く(bsky_acc
     result = json.loads(r.stdout)
     by_id = {m["message_id"]: m for m in result["messages"]}
 
+    # T7-3: object には `source`（ledger／queue／thread のどこで見つかったか）が付く。
     assert by_id[R1_URI]["already_replied"] == {
         "post_id": "at://" + DID + "/app.bsky.feed.post/myreply1",
-        "at": "2026-09-16T05:00:00+09:00"}
-    assert by_id[R4_URI]["already_replied"] == {"status": "draft"}
-    # まだ絡んでいない相手には無い。
+        "at": "2026-09-16T05:00:00+09:00", "source": "ledger"}
+    assert by_id[R4_URI]["already_replied"] == {"status": "draft", "source": "queue"}
+    # まだ絡んでいない相手には`False`（台帳・queueは両方読めているので
+    # 「見当たらない」と言い切れる・「返していない」の確定ではない・T7-3）。
+    assert by_id[R3_URI]["already_replied"] is False
+    assert by_id[R5_URI]["already_replied"] is False
+
+
+# --- T7-3: already_replied を枝の中の自分の返信からも埋める（3 値の意味） -----
+# 設計「自分の泉」§2.1・T7-3 発注書「その枝に is_own: true の返信があり、
+# その replied_to がこの message なら、台帳に無くても already_replied を
+# 埋める」。`false`＝見当たらない（返していない、の確定ではない）／
+# `null`＝台帳か queue が読めず判らない、の 2 つも別々に確かめる。
+
+
+def test_台帳queueに無くても枝の中の自分の返信からalready_repliedが埋まる(bsky_account):
+    account, service = bsky_account
+    # 台帳にも queue にも何も無い状態（このテストは追加しない）。
+    r = _cli(account["name"], ROOT_URI, service=service)
+    assert r.returncode == 0, r.stdout + r.stderr
+    result = json.loads(r.stdout)
+    by_id = {m["message_id"]: m for m in result["messages"]}
+
+    # R2（自分）は R1（bob）への返信——台帳に無くても枝そのものから拾う。
+    assert by_id[R1_URI]["already_replied"] == {
+        "post_id": R2_URI, "at": "2026-09-16T02:00:00.000Z", "source": "thread"}
+    # R2・R3・R4・R5 には自分からの返信がぶら下がっていない
+    # ——台帳・queue も空なので`False`（見当たらない。「返していない」の確定ではない）。
+    assert by_id[R2_URI]["already_replied"] is False
+    assert by_id[R3_URI]["already_replied"] is False
+    assert by_id[R4_URI]["already_replied"] is False
+    assert by_id[R5_URI]["already_replied"] is False
+
+
+def test_台帳が読めなければ見当たらなくてもFalseでなくNoneになる(bsky_account, tmp_path):
+    account, service = bsky_account
+    cfg = accounts_mod.load_account(account["name"])
+    eng_dir = accounts_mod.data_dirs(cfg, account["name"])["engagements"]
+    os.makedirs(eng_dir, exist_ok=True)
+    # 壊れた ndjson（JSON として読めない行）を 1 本置く——
+    # `engagements.load()` はこのファイルを `broken` として中身を捨てる
+    # （`thth/engagements.py::_read_ndjson()` と同じ流儀）。
+    with open(os.path.join(eng_dir, "2026-09.ndjson"), "w", encoding="utf-8") as f:
+        f.write("これは JSON ではありません\n")
+
+    r = _cli(account["name"], ROOT_URI, service=service)
+    assert r.returncode == 0, r.stdout + r.stderr
+    result = json.loads(r.stdout)
+    by_id = {m["message_id"]: m for m in result["messages"]}
+
+    # R1 は枝の中の自分の返信（R2）があるので、台帳が読めなくても object のまま
+    # （見つかったものを取り消さない）。
+    assert by_id[R1_URI]["already_replied"]["source"] == "thread"
+    # どこにも見当たらない行は、`False`（見当たらない）ではなく`None`
+    # （「台帳が読めないので判らない」・T7-3 規約）。
     assert by_id[R3_URI]["already_replied"] is None
     assert by_id[R5_URI]["already_replied"] is None
+    assert any("絡みの台帳" in reason for reason in result["provenance"]["ledgers_unreadable"])
 
 
 def test_max_messagesを超えたら新しい側を切りcontinue_fromを返す(bsky_account):
@@ -268,6 +322,74 @@ def test_you_and_themにlast_reactionがある(bsky_account):
     assert you_and_them[dave_key]["last_reaction"] is None
 
 
+# --- T7-1: Threadsの偽サーバで枝を読む（conversation()の生の行をMessageの形に揃える） ---
+# `ThreadsAdapter.conversation()`は生の行（`id`・`replied_to: {"id": …}`・
+# `root_post: {"id": …}`）を返す（返信の台帳との互換のため adapter 自身は
+# 変えない・設計「自分の泉」T7-1発注書）。`thread_read`は`normalize_message()`
+# を通してから読むので、Threadsでも`message_id`・`depth`・`already_replied`が
+# ちゃんと埋まることをここで確かめる（T1-2はBluesky・Mastodonの偽サーバだけで
+# 枝を確かめていた・Threadsは400の経路だけだった、という所見の穴）。
+
+C1_ID, C2_ID, C3_ID = "C1", "C2", "C3"
+
+
+def _threads_conversation_rows():
+    """根（`OTHER_POST_ID`・alice）→ C1（bob）→ C2（nigamilab・自分）→ C3（carol）。"""
+    return [
+        {"id": C1_ID, "username": "bob", "text": "bobの返信",
+         "timestamp": "2026-09-16T01:00:00+0000",
+         "replied_to": {"id": OTHER_POST_ID}, "root_post": {"id": OTHER_POST_ID},
+         "permalink": "https://t/c1", "has_replies": True, "is_reply": True},
+        {"id": C2_ID, "username": "nigamilab", "text": "自分の返信",
+         "timestamp": "2026-09-16T02:00:00+0000",
+         "replied_to": {"id": C1_ID}, "root_post": {"id": OTHER_POST_ID},
+         "permalink": "https://t/c2", "has_replies": True, "is_reply": True},
+        {"id": C3_ID, "username": "carol", "text": "孫の返信",
+         "timestamp": "2026-09-16T03:00:00+0000",
+         "replied_to": {"id": C2_ID}, "root_post": {"id": OTHER_POST_ID},
+         "permalink": "https://t/c3", "has_replies": False, "is_reply": True},
+    ]
+
+
+def test_Threadsの枝も根から時刻順でdepthとis_ownつきで返る(isolated_account_factory, tmp_path):
+    token_path = str(tmp_path / "threads.token")
+    _write_token(token_path, {"access_token": "FAKE-SECRET", "user_id": "999999",
+                              "username": "nigamilab", "scopes": None,
+                              "obtained_at": "2026-09-16T09:00:00+09:00"})
+    account = isolated_account_factory(
+        "nigamilab-threads-branch-test", media="threads", handle="nigamilab",
+        token=token_path, production=False)
+
+    with _server(conversation_rows=_threads_conversation_rows()) as (base_url, requests):
+        r = run_thth(["thread", account["name"], OTHER_POST_ID, "--json"],
+                     env={"THTH_THREADS_BASE_URL": base_url})
+    assert r.returncode == 0, r.stdout + r.stderr
+    result = json.loads(r.stdout)
+
+    assert result["root"]["post_id"] == OTHER_POST_ID
+    assert result["root"]["username"] == "alice"
+
+    ids = [m["message_id"] for m in result["messages"]]
+    assert ids == [C1_ID, C2_ID, C3_ID], ids   # Threadsの生の`id`から写った
+
+    by_id = {m["message_id"]: m for m in result["messages"]}
+    assert by_id[C1_ID]["depth"] == 1 and by_id[C1_ID]["replied_to"] == OTHER_POST_ID
+    assert by_id[C2_ID]["depth"] == 2 and by_id[C2_ID]["replied_to"] == C1_ID
+    assert by_id[C3_ID]["depth"] == 3 and by_id[C3_ID]["replied_to"] == C2_ID
+
+    # `replied_to`は`{"id": …}`のdictではなく、id文字列に開かれていること。
+    for m in result["messages"]:
+        assert isinstance(m["replied_to"], str)
+
+    assert by_id[C2_ID]["is_own"] is True
+    assert by_id[C1_ID]["is_own"] is False
+    assert by_id[C3_ID]["is_own"] is False
+    assert by_id[C2_ID]["author_key"] is not None
+
+    counts = result["counts"]
+    assert counts["messages"] == 3 and counts["own"] == 1 and counts["participants"] == 4
+
+
 def test_Threadsで他人の根が400ならPermissionMissingのままrc1(isolated_account_factory, tmp_path):
     with _server({f"/{OTHER_POST_ID}": "permission"}) as (base_url, requests):
         token_path = str(tmp_path / "threads.token")

{thth-2.3.0 → thth-2.3.1}/tests/test_threads_read_permissions.py

@@ -80,6 +80,8 @@ class _ReadOnlyThreads(http.server.BaseHTTPRequestHandler):
     """
     behavior: dict = {}
     requests: list = []
+    # `/conversation` が返す行（既定は空・T7-1 の枝テストで差し替える）。
+    conversation_rows: list = []
 
     def _json(self, status, payload):
         body = json.dumps(payload).encode("utf-8")
@@ -121,7 +123,7 @@ class _ReadOnlyThreads(http.server.BaseHTTPRequestHandler):
         if p.endswith("/insights"):
             return self._json(200, {"data": [{"name": "views", "values": [{"value": 7}]}]})
         if p.endswith("/conversation"):
-            return self._json(200, {"data": []})
+            return self._json(200, {"data": self.conversation_rows})
         if p == f"/v1.0/{OTHER_POST_ID}":
             return self._json(200, OTHER_POST)
         return self._json(200, {"data": []})
@@ -138,10 +140,11 @@ class _ReadOnlyThreads(http.server.BaseHTTPRequestHandler):
 
 
 @contextlib.contextmanager
-def _server(behavior=None):
+def _server(behavior=None, *, conversation_rows=None):
     requests: list = []
     handler = type("H", (_ReadOnlyThreads,), {"behavior": dict(behavior or {}),
-                                               "requests": requests})
+                                               "requests": requests,
+                                               "conversation_rows": list(conversation_rows or [])})
     server = http.server.HTTPServer(("127.0.0.1", 0), handler)
     thread = threading.Thread(target=server.serve_forever, daemon=True)
     thread.start()

thth-2.3.1/thth/VERSION

@@ -0,0 +1 @@
+2.3.1

{thth-2.3.0 → thth-2.3.1}/thth/adapters/base.py

@@ -158,6 +158,42 @@ def author_key(medium: str, username: str | None) -> str | None:
     return digest[:16]
 
 
+def normalize_message(row: dict, *, medium: str) -> dict:
+    """媒体の生の行を`Message`の形（`message_id`・`replied_to`・`root_post`は
+    id の文字列）に揃える（T7-1・設計「自分の泉」§2.1）。
+
+    **`conversation()`自身の戻りは変えない**——`collect`・`threadshape`・
+    `replies`の台帳（ndjson）は媒体ごとの生の鍵（Threadsなら`id`・
+    `replied_to: {"id": …}`）をそのまま読むので、そこを揃えると既存の台帳の
+    互換が壊れる（設計「自分の泉」T7-1発注書）。ここは`thread_read`など
+    「読んで見せる」口が、adapterの生の行を使う直前にだけ通す変換。
+
+    やること（3 つ）:
+      - `message_id`が無ければ`id`から写す（あれば触らない）。
+      - `replied_to`・`root_post`が dict（Threadsの`{"id": …}`）なら`.get("id")`
+        を、文字列ならそのまま、無ければ`None`のまま。
+      - `author_key`が無ければ`author_key(medium, username)`で埋める。
+
+    他の鍵（`text`・`username`・`timestamp`・`permalink`・`has_replies`・
+    `is_reply`等）はそのまま素通しする。
+
+    **冪等**: 既に`Message`の形の行（Bluesky・Mastodonの`conversation()`・
+    Threadsの`_message_row()`・`fetch_post()`の戻り）を渡しても同じ行が返る
+    ——2 回通しても壊れない。
+    """
+    out = dict(row)
+    if not out.get("message_id"):
+        out["message_id"] = out.get("id")
+    for key in ("replied_to", "root_post"):
+        value = out.get(key)
+        if isinstance(value, dict):
+            out[key] = value.get("id")
+        # 文字列・None はそのまま（既に揃っている・またはそもそも無い）。
+    if not out.get("author_key"):
+        out["author_key"] = author_key(medium, out.get("username"))
+    return out
+
+
 @dataclasses.dataclass
 class Message:
     """会話の 1 行（設計 v2 §4.2。旧 `Reply` の改名）。

{thth-2.3.0 → thth-2.3.1}/thth/cli.py

@@ -26,6 +26,7 @@ from . import where_cli as where_cli_mod
 from . import who_cli as who_cli_mod
 from . import collect as collect_mod
 from . import core
+from . import engagements as engagements_mod
 from . import jst
 from . import lint as lint_mod
 from . import lock as lock_mod
@@ -2173,6 +2174,13 @@ def cmd_send(args) -> int:
     **`--confirm`**（外部レビュー §1b・受け入れ 6）: dry-run（`--production` を
     付けない実行）が表示する短い digest を、`--production` のときに
     `--confirm <digest>` として渡す。省略・不一致はどちらも送らない。
+
+    **`--reply-to-author-key`・`--reply-to-root`・`--found-by`**（T7-2・設計
+    「自分の泉」§4）: `--reply-to` で返信として出すとき、絡みの台帳（誰に・
+    どの枝へ絡みに行ったか）に残す任意項目。queue の front-matter
+    `reply_to_author_key`・`reply_to_root`・`found_by` と同じ意味。
+    `--reply-to-author-key` を省略すると、`reply_to` の投稿を 1 回
+    best-effort に読みに行って埋める（失敗しても送信は止めない）。
     """
     import sys as _sys
     from . import core as core_mod
@@ -2183,6 +2191,8 @@ def cmd_send(args) -> int:
         text = _sys.stdin.read()
     result = core_mod.send_once(
         args.account, text=text, topic=args.topic, reply_to=args.reply_to,
+        reply_to_root=args.reply_to_root, reply_to_author_key=args.reply_to_author_key,
+        found_by=args.found_by,
         production_flag=args.production, confirm=args.confirm, log=print)
     return result.exit_code
 
@@ -2709,6 +2719,16 @@ def build_parser() -> argparse.ArgumentParser:
                         help="本文のファイル。省略時は標準入力から読む")
     p_send.add_argument("--topic", default=None)
     p_send.add_argument("--reply-to", dest="reply_to", default=None)
+    # T7-2（設計「自分の泉」§4）: queue の front-matter と同じ意味の 3 つ。
+    # `--reply-to` があるときだけ絡みの台帳に 1 行残る。
+    p_send.add_argument("--reply-to-author-key", dest="reply_to_author_key", default=None,
+                        help="相手の仮名（16 進 16 桁）。省略すると reply_to の投稿を"
+                             "best-effort に読みに行って埋める（失敗しても送信は止めない）")
+    p_send.add_argument("--reply-to-root", dest="reply_to_root", default=None,
+                        help="この返信がぶら下がる枝の根の post_id（判れば）")
+    p_send.add_argument("--found-by", dest="found_by", default=None,
+                        choices=sorted(engagements_mod.FOUND_BY_VALUES),
+                        help="絡みに行った先をどう見つけたか（where_to_appear／manual／mention）")
     p_send.add_argument("--production", action="store_true",
                         help="本番で出す（台帳 production: true が無ければ dry-run のまま）")
     p_send.add_argument("--confirm", default=None,