thth 2.3.0__tar.gz → 2.3.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: thth
-Version: 2.3.0
+Version: 2.3.2
 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.2**。全件テスト **2310 件**（`python -m pytest tests/ -q -n auto -p no:cacheprovider`・1 skip・rc=0）。
 
 **媒体**: Threads（稼働）・Bluesky・Mastodon（同席用の台帳あり・未稼働）。
 
@@ -79,7 +79,7 @@ timer（systemd・`thth systemd` で生成）で毎時投稿、返信の採集
 - **英語の文書**: [README.en.md](README.en.md)・[docs/usage.en.md](docs/usage.en.md)・[llms.txt](llms.txt)。
 - **skill**: `skills/thth/SKILL.md`（wheel にも入る）。
 
-- **動くもの**（`thth --help` の全 34 サブコマンド）: `lint`・`preview`・`approve`・`account`・`revoke`・`posts`・`replies`・`measured`・`threads`・`after`・`topics`・`forms`・`queue`・`schedule`・`throw`・`run`・`systemd`・`board`・`collect`・`auth`・`refresh`・`maintain`・`send`・`doctor`・`app`・`token`・`ask`・`mentions`・`profile`・`thread`・`where`・`who`・`retract`・`location`。
+- **動くもの**（`thth --help` の全 35 サブコマンド）: `lint`・`preview`・`approve`・`account`・`revoke`・`posts`・`replies`・`measured`・`threads`・`after`・`topics`・`forms`・`queue`・`schedule`・`throw`・`run`・`systemd`・`board`・`collect`・`pull`・`auth`・`refresh`・`maintain`・`send`・`doctor`・`app`・`token`・`ask`・`mentions`・`profile`・`thread`・`where`・`who`・`retract`・`location`。
 - **最初の本番投稿の記録**: 2026-09-09、@aoking に疎通確認を 1 本（`17916074118445631`）。
 - **未着手**: X・Facebook ページ・Instagram の各アダプタ。トピック検索の権限（tester には降りない）。泉のサーバ（v2-5）。
 - **権限の制約**: tester に降りる scope は 5 つ。削除はできない。

{thth-2.3.0 → thth-2.3.2}/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.2**。全件テスト **2310 件**（`python -m pytest tests/ -q -n auto -p no:cacheprovider`・1 skip・rc=0）。
 
 **媒体**: Threads（稼働）・Bluesky・Mastodon（同席用の台帳あり・未稼働）。
 
@@ -55,7 +55,7 @@ timer（systemd・`thth systemd` で生成）で毎時投稿、返信の採集
 - **英語の文書**: [README.en.md](README.en.md)・[docs/usage.en.md](docs/usage.en.md)・[llms.txt](llms.txt)。
 - **skill**: `skills/thth/SKILL.md`（wheel にも入る）。
 
-- **動くもの**（`thth --help` の全 34 サブコマンド）: `lint`・`preview`・`approve`・`account`・`revoke`・`posts`・`replies`・`measured`・`threads`・`after`・`topics`・`forms`・`queue`・`schedule`・`throw`・`run`・`systemd`・`board`・`collect`・`auth`・`refresh`・`maintain`・`send`・`doctor`・`app`・`token`・`ask`・`mentions`・`profile`・`thread`・`where`・`who`・`retract`・`location`。
+- **動くもの**（`thth --help` の全 35 サブコマンド）: `lint`・`preview`・`approve`・`account`・`revoke`・`posts`・`replies`・`measured`・`threads`・`after`・`topics`・`forms`・`queue`・`schedule`・`throw`・`run`・`systemd`・`board`・`collect`・`pull`・`auth`・`refresh`・`maintain`・`send`・`doctor`・`app`・`token`・`ask`・`mentions`・`profile`・`thread`・`where`・`who`・`retract`・`location`。
 - **最初の本番投稿の記録**: 2026-09-09、@aoking に疎通確認を 1 本（`17916074118445631`）。
 - **未着手**: X・Facebook ページ・Instagram の各アダプタ。トピック検索の権限（tester には降りない）。泉のサーバ（v2-5）。
 - **権限の制約**: tester に降りる scope は 5 つ。削除はできない。

{thth-2.3.0 → thth-2.3.2}/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.2}/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.2/tests/test_behind_remote.py

@@ -0,0 +1,137 @@
+"""`writeback.behind_remote()` と `thth queue`/`schedule`/`board` の遅れ表示
+（発注 T8-2・kopicha 続報）。
+
+`thth approve`（と `revoke`・`throw`・`collect`・`retract`）は既に
+`writeback.sync_repo()` を通しているが、**読むだけの口**（`queue`・
+`schedule`・`board`）は通していない。push した直後に読むだけの口を見ると、
+timer の `collect` が pull するまでの間、まだ取り込み前の一覧が出る
+——**読むだけの口が勝手に pull するのは避ける**のが設計の芯なので、
+ここでは「遅れていることを言う」だけを確かめる（取り込みは T8-3 の
+`thth pull` か `thth approve` が行う）。
+"""
+from __future__ import annotations
+
+from tests.conftest import init_git_pair, run_git, run_thth, write_queue_file
+from thth import writeback
+
+
+def test_behind_remoteは追いついていれば0(tmp_path):
+    pair = init_git_pair(tmp_path / "a", seed_content="", seed_name=".gitkeep")
+    info = writeback.behind_remote(pair["work"])
+    assert info == {"behind": 0, "ahead": 0, "head": info["head"],
+                     "fetched_at": info["fetched_at"], "reason": None}
+    assert info["head"]
+    assert info["reason"] is None
+
+
+def test_behind_remoteはfetchだけでpullしない(tmp_path):
+    """**pull はしない**——fetch のあと、work の作業ツリー（HEAD）は動かない。"""
+    pair = init_git_pair(tmp_path / "a", seed_content="旧", seed_name="a.md")
+    head_before = run_git(pair["work"], ["rev-parse", "HEAD"]).stdout.strip()
+
+    run_git(pair["seed"], ["commit", "--allow-empty", "-m", "second"])
+    run_git(pair["seed"], ["push"])
+
+    info = writeback.behind_remote(pair["work"])
+    assert info["behind"] == 1
+    assert info["ahead"] == 0
+
+    head_after = run_git(pair["work"], ["rev-parse", "HEAD"]).stdout.strip()
+    assert head_after == head_before, "fetch だけのはずが HEAD が動いた（pull してしまった）"
+
+
+def test_behind_remoteはfetchできないとNoneとreason(tmp_path):
+    broken = tmp_path / "broken"
+    run_git_init = __import__("subprocess").run(
+        ["git", "init", "-b", "main", str(broken)], capture_output=True, text=True)
+    assert run_git_init.returncode == 0
+    run_git(str(broken), ["remote", "add", "origin", "/does/not/exist/repo.git"])
+    run_git(str(broken), ["commit", "--allow-empty", "-m", "x"])
+
+    info = writeback.behind_remote(str(broken))
+    assert info["behind"] is None
+    assert info["ahead"] is None
+    assert info["reason"]
+    assert "0" != info["reason"]  # **0 と混ぜない**: reason があるのに behind: 0 ではない
+
+
+def test_queueは遅れているときに先頭に1行(isolated_account_factory, tmp_path):
+    pair = init_git_pair(tmp_path / "acct", seed_content="", seed_name=".gitkeep")
+    account = isolated_account_factory(repo_dir=pair["work"])
+    write_queue_file(account["queue_dir"], "a.md",
+                      fm_overrides={"status": "draft", "account": account["name"]})
+
+    # **`seed` を origin の最新に合わせてから**新しい commit を積む（`work` の
+    # `write_queue_file()` push で origin が進んでいるため、合わせないと
+    # `seed` の push 自体が non-fast-forward で失敗する）。
+    run_git(pair["seed"], ["pull"])
+    run_git(pair["seed"], ["commit", "--allow-empty", "-m", "second"])
+    run_git(pair["seed"], ["push"])
+
+    result = run_thth(["queue", account["name"]])
+    assert result.returncode == 0, result.stderr
+    assert "remote に 1 commit 分の新しいものがあります" in result.stdout
+    assert f"thth pull {account['name']}" in result.stdout
+
+
+def test_queueは遅れていなければ何も出さない(isolated_account_factory, tmp_path):
+    pair = init_git_pair(tmp_path / "acct", seed_content="", seed_name=".gitkeep")
+    account = isolated_account_factory(repo_dir=pair["work"])
+    write_queue_file(account["queue_dir"], "a.md",
+                      fm_overrides={"status": "draft", "account": account["name"]})
+
+    result = run_thth(["queue", account["name"]])
+    assert result.returncode == 0, result.stderr
+    assert "remote に" not in result.stdout
+    assert "thth pull" not in result.stdout
+
+
+def test_queueのjsonにrepoが乗る(isolated_account_factory, tmp_path):
+    pair = init_git_pair(tmp_path / "acct", seed_content="", seed_name=".gitkeep")
+    account = isolated_account_factory(repo_dir=pair["work"])
+    write_queue_file(account["queue_dir"], "a.md",
+                      fm_overrides={"status": "draft", "account": account["name"]})
+
+    result = run_thth(["queue", account["name"], "--json"])
+    assert result.returncode == 0, result.stderr
+    import json
+    out = json.loads(result.stdout)
+    assert out[account["name"]]["repo"]["behind"] == 0
+
+
+def test_scheduleは遅れているときに先頭に1行(isolated_account_factory, tmp_path):
+    pair = init_git_pair(tmp_path / "acct", seed_content="", seed_name=".gitkeep")
+    account = isolated_account_factory(repo_dir=pair["work"])
+    write_queue_file(account["queue_dir"], "a.md",
+                      fm_overrides={"status": "draft", "account": account["name"],
+                                    "publish_at": "2026-09-20T08:00:00+09:00"})
+
+    run_git(pair["seed"], ["pull"])
+    run_git(pair["seed"], ["commit", "--allow-empty", "-m", "second"])
+    run_git(pair["seed"], ["push"])
+
+    result = run_thth(["schedule", account["name"]])
+    assert result.returncode == 0, result.stderr
+    assert "remote に 1 commit 分の新しいものがあります" in result.stdout
+
+
+def test_boardは遅れているaccountの行の下に1行(isolated_account_factory, tmp_path):
+    pair = init_git_pair(tmp_path / "acct", seed_content="", seed_name=".gitkeep")
+    account = isolated_account_factory(repo_dir=pair["work"])
+
+    run_git(pair["seed"], ["commit", "--allow-empty", "-m", "second"])
+    run_git(pair["seed"], ["push"])
+
+    result = run_thth(["board"])
+    assert result.returncode == 0, result.stderr
+    assert "repo が 1 commit 遅れています" in result.stdout
+    assert f"thth pull {account['name']}" in result.stdout
+
+
+def test_boardは遅れていなければ何も出さない(isolated_account_factory, tmp_path):
+    pair = init_git_pair(tmp_path / "acct", seed_content="", seed_name=".gitkeep")
+    isolated_account_factory(repo_dir=pair["work"])
+
+    result = run_thth(["board"])
+    assert result.returncode == 0, result.stderr
+    assert "repo が" not in result.stdout

thth-2.3.2/tests/test_cli_vm_path.py

@@ -0,0 +1,80 @@
+"""VM に無いパスを渡したときの断り方（発注 T8-1・kopicha 続報）。
+
+`~/.local/bin/thth` は Mac から VM へ ssh する薄いラッパで、引数はそのまま
+VM 側の `thth` に渡る。**Mac 側の相対パスも絶対パスも VM には無い**ので、
+いままでは `FileNotFoundError` の素の traceback が出ていた（`--article
+/tmp/x.json` で踏んだのと同じ根）。
+
+ファイルを受け取る全ての引数（`lint`・`approve`・`revoke`・`preview`・
+`send --text-file`・`topics suggest` の queue ファイル・`--article`・
+`--proposal`・`--input`・`--draft`・`--revised-draft`）が、共通の
+`cli._require_vm_path()` を通って rc=2・案内つきで断ることを確かめる。
+存在するパスは従来どおり動くことも確かめる（回帰）。
+"""
+from __future__ import annotations
+
+import os
+
+from tests.conftest import run_thth, write_queue_file
+
+MISSING = "/tmp/thth-t8-does-not-exist-まさかここには無い.md"
+MISSING_JSON = "/tmp/thth-t8-does-not-exist-まさかここには無い.json"
+
+
+def _assert_vm_refusal(result, *, rc=2):
+    combined = result.stdout + result.stderr
+    assert result.returncode == rc, f"rc={result.returncode}: {combined}"
+    assert "VM" in combined, combined
+    assert "thth queue" in combined, combined
+    assert "Traceback" not in result.stderr, result.stderr
+
+
+def test_lintにVMに無いパスを渡すとrc2で案内する():
+    result = run_thth(["lint", MISSING])
+    _assert_vm_refusal(result)
+
+
+def test_approveにVMに無いパスを渡すとrc2で案内する():
+    result = run_thth(["approve", MISSING])
+    _assert_vm_refusal(result)
+
+
+def test_sendのtext_fileにVMに無いパスを渡すとrc2で案内する(isolated_account):
+    result = run_thth(["send", isolated_account["name"], "--text-file", MISSING])
+    _assert_vm_refusal(result)
+
+
+def test_topics_suggestのarticleにVMに無いパスを渡すとrc2で案内する(isolated_account):
+    queue_path = write_queue_file(
+        isolated_account["queue_dir"], "q.md",
+        body="## threads\n\nhello https://example.test/x\n",
+        fm_overrides={"status": "draft", "account": isolated_account["name"]})
+    result = run_thth(["topics", "suggest", queue_path, "--article", MISSING_JSON])
+    _assert_vm_refusal(result)
+
+
+def test_revokeにVMに無いパスを渡すとrc2で案内する():
+    result = run_thth(["revoke", MISSING, "--by", "test"])
+    _assert_vm_refusal(result)
+
+
+def test_previewにVMに無いパスを渡すとrc2で案内する():
+    result = run_thth(["preview", MISSING])
+    _assert_vm_refusal(result)
+
+
+def test_存在するパスは従来どおり動く(isolated_account):
+    """回帰: 存在するパスには案内を出さない（発注書「存在するパスは従来どおり」）。"""
+    queue_path = write_queue_file(
+        isolated_account["queue_dir"], "ok.md",
+        body="## threads\n\nこんにちは https://example.test/x\n",
+        fm_overrides={"status": "draft", "account": isolated_account["name"]})
+    assert os.path.exists(queue_path)
+
+    result = run_thth(["lint", queue_path])
+    assert "VM" not in (result.stdout + result.stderr)
+    assert "thth queue" not in (result.stdout + result.stderr)
+
+    result = run_thth(["preview", queue_path])
+    assert result.returncode == 0, result.stderr
+    assert "こんにちは" in result.stdout

{thth-2.3.0 → thth-2.3.2}/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.2/tests/test_pull_cli.py

@@ -0,0 +1,96 @@
+"""`thth pull <account|--project P>`（発注 T8-3・kopicha 続報）。
+
+読むだけの口（`queue`・`schedule`・`board`。T8-2）は遅れを**言うだけ**で
+pull しない。この道具は、その案内から誘導される**明示の**取り込み口——
+`writeback.sync_repo()` を呼ぶだけで、`thth approve` が既に通しているのと
+同じ関数・同じ repo ロックを使う。
+"""
+from __future__ import annotations
+
+import json
+
+from tests.conftest import init_git_pair, run_git, run_thth
+
+
+def test_pullはffして取り込む(isolated_account_factory, tmp_path):
+    pair = init_git_pair(tmp_path / "acct", seed_content="旧", seed_name="a.md")
+    account = isolated_account_factory(repo_dir=pair["work"])
+    head_before = run_git(pair["work"], ["rev-parse", "--short", "HEAD"]).stdout.strip()
+
+    run_git(pair["seed"], ["commit", "--allow-empty", "-m", "second"])
+    run_git(pair["seed"], ["push"])
+    head_after_remote = run_git(pair["seed"], ["rev-parse", "--short", "HEAD"]).stdout.strip()
+
+    result = run_thth(["pull", account["name"]])
+    assert result.returncode == 0, result.stderr
+    assert f"取り込みました: {head_before} → {head_after_remote}（1 commit）" in result.stdout
+
+    # 本当に取り込まれている（work の HEAD が動いた）。
+    head_now = run_git(pair["work"], ["rev-parse", "--short", "HEAD"]).stdout.strip()
+    assert head_now == head_after_remote
+
+
+def test_pullはすでに最新なら何も変えない(isolated_account_factory, tmp_path):
+    pair = init_git_pair(tmp_path / "acct", seed_content="", seed_name=".gitkeep")
+    account = isolated_account_factory(repo_dir=pair["work"])
+    head_before = run_git(pair["work"], ["rev-parse", "--short", "HEAD"]).stdout.strip()
+
+    result = run_thth(["pull", account["name"]])
+    assert result.returncode == 0, result.stderr
+    assert "すでに最新です" in result.stdout
+
+    head_after = run_git(pair["work"], ["rev-parse", "--short", "HEAD"]).stdout.strip()
+    assert head_after == head_before
+
+
+def test_pullのjsonはbehind_remoteの形(isolated_account_factory, tmp_path):
+    pair = init_git_pair(tmp_path / "acct", seed_content="", seed_name=".gitkeep")
+    account = isolated_account_factory(repo_dir=pair["work"])
+
+    result = run_thth(["pull", account["name"], "--json"])
+    assert result.returncode == 0, result.stderr
+    out = json.loads(result.stdout)
+    assert len(out) == 1
+    row = out[0]
+    assert row["account"] == account["name"]
+    assert row["ok"] is True
+    assert set(row["repo"].keys()) == {"behind", "ahead", "head", "fetched_at", "reason"}
+    assert row["repo"]["behind"] == 0
+
+
+def test_pullのprojectは同じrepoを共有する2accountで1回だけ引く(
+        isolated_account_factory, tmp_path):
+    pair = init_git_pair(tmp_path / "acct", seed_content="旧", seed_name="a.md")
+    account_a = isolated_account_factory("a-threads", repo_dir=pair["work"], project="shared")
+    account_b = isolated_account_factory("b-threads", repo_dir=pair["work"], project="shared")
+    assert account_a["repo_dir"] == account_b["repo_dir"]
+
+    run_git(pair["seed"], ["commit", "--allow-empty", "-m", "second"])
+    run_git(pair["seed"], ["push"])
+
+    result = run_thth(["pull", "--project", "shared", "--json"])
+    assert result.returncode == 0, result.stderr
+    out = json.loads(result.stdout)
+    # **重複なく 1 回だけ**——2 account だが repo は 1 つ。
+    assert len(out) == 1
+    assert out[0]["repo"]["behind"] == 0
+
+
+def test_pullは失敗をsync_repoの理由のままrc1(isolated_account_factory, tmp_path):
+    account = isolated_account_factory(repo_dir=str(tmp_path / "no-such-repo-dir"))
+
+    result = run_thth(["pull", account["name"]])
+    assert result.returncode == 1, result.stdout
+    assert "取り込めませんでした" in result.stderr or "見当たりません" in result.stderr
+
+
+def test_pullはaccountもprojectも無ければ断る(isolated_account_factory):
+    result = run_thth(["pull"])
+    assert result.returncode == 2
+    assert "account" in result.stderr
+
+
+def test_pullは未知のprojectを断る(isolated_account_factory):
+    result = run_thth(["pull", "--project", "no-such-project"])
+    assert result.returncode == 2
+    assert "no-such-project" in result.stderr

{thth-2.3.0 → thth-2.3.2}/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"]) == []