thth 3.3.0__tar.gz → 3.3.1__tar.gz

{thth-3.3.0 → thth-3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: thth
-Version: 3.3.0
+Version: 3.3.1
 Summary: 承認済みの投稿だけを投げる門（Threads・Bluesky・Mastodon）。人が承認し、記録は利用者の git に残る。
 Project-URL: Homepage, https://thth.me
 Project-URL: Source, https://github.com/aokings/thth
@@ -125,7 +125,7 @@ timer（systemd・`thth systemd` で生成）は10分ごとに実行し、投稿
 - **英語の文書**: [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` の全サブコマンド）: `lint`・`preview`・`approve`・`account`・`revoke`・`posts`・`replies`・`measured`・`threads`・`after`・`analytics-report`・`study-report`・`study`・`unanswered`・`handoff-report`・`observe`・`morning`・`serve-reports`・`approval-worker`・`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`・`notifications`・`report`・`admin`。
+- **動くもの**（`thth --help` の全サブコマンド）: `lint`・`preview`・`approve`・`account`・`revoke`・`posts`・`replies`・`measured`・`threads`・`after`・`analytics-report`・`study-report`・`study`・`unanswered`・`handoff-report`・`observe`・`morning`・`serve-reports`・`approval-worker`・`topics`・`forms`・`queue`・`schedule`・`throw`・`run`・`systemd`・`board`・`collect`・`pull`・`auth`・`refresh`・`maintain`・`send`・`doctor`・`app`・`token`・`ask`・`mentions`・`profile`・`thread`・`where`・`who`・`retract`・`inflight`・`location`・`notifications`・`report`・`admin`。
 - **最初の本番投稿の記録**: 2026-09-09、@aoking に疎通確認を 1 本（`17916074118445631`）。
 - **未着手**: X・Facebook ページ・Instagram の各アダプタ。トピック検索の権限（tester には降りない）。泉のサーバ（v2-5）。
 - **権限の制約**: tester に降りる scope は 5 つ。削除はできない。

{thth-3.3.0 → thth-3.3.1}/README.md

@@ -101,7 +101,7 @@ timer（systemd・`thth systemd` で生成）は10分ごとに実行し、投稿
 - **英語の文書**: [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` の全サブコマンド）: `lint`・`preview`・`approve`・`account`・`revoke`・`posts`・`replies`・`measured`・`threads`・`after`・`analytics-report`・`study-report`・`study`・`unanswered`・`handoff-report`・`observe`・`morning`・`serve-reports`・`approval-worker`・`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`・`notifications`・`report`・`admin`。
+- **動くもの**（`thth --help` の全サブコマンド）: `lint`・`preview`・`approve`・`account`・`revoke`・`posts`・`replies`・`measured`・`threads`・`after`・`analytics-report`・`study-report`・`study`・`unanswered`・`handoff-report`・`observe`・`morning`・`serve-reports`・`approval-worker`・`topics`・`forms`・`queue`・`schedule`・`throw`・`run`・`systemd`・`board`・`collect`・`pull`・`auth`・`refresh`・`maintain`・`send`・`doctor`・`app`・`token`・`ask`・`mentions`・`profile`・`thread`・`where`・`who`・`retract`・`inflight`・`location`・`notifications`・`report`・`admin`。
 - **最初の本番投稿の記録**: 2026-09-09、@aoking に疎通確認を 1 本（`17916074118445631`）。
 - **未着手**: X・Facebook ページ・Instagram の各アダプタ。トピック検索の権限（tester には降りない）。泉のサーバ（v2-5）。
 - **権限の制約**: tester に降りる scope は 5 つ。削除はできない。

{thth-3.3.0 → thth-3.3.1}/skills/thth/SKILL.md

@@ -168,7 +168,7 @@ MCP `after_you_posted`。**24h の刻みが無ければ `null`**（0 と混ぜ
 
 新規 account は利用者メール・管理者メール・TLS SMTP を `thth notifications config` で設定し、`status` → `test` を実行する。両宛先の受信箱で到達、account 専用 HEALTHCHECK_URL の missed-ping 通知を確認してから production/scheduled を有効にする。既存 account にも同じ設定を追加する。詳細は `docs/停止通知と運用記録.md`。
 
-プロジェクトの作業開始・再開時は `git fetch` 後にリモート `docs/sns/queue/` の `thth_run_state`・`thth_run_detail`・`thth_run_next` を確認する。dirty worktree へ無条件に pull しない。リモートの確認は `git show origin/main:docs/sns/queue/FILE.md` 等で行える。停止・成否不明なら inflight を消して再投稿せず、示された確認を行う。復旧状態は投稿成功の保証ではなく、公開結果は status/post_id/posted_at を見る。
+プロジェクトの作業開始・再開時は `git fetch` 後にリモート `docs/sns/queue/` の `thth_run_state`・`thth_run_detail`・`thth_run_next` を確認する。dirty worktree へ無条件に pull しない。リモートの確認は `git show origin/main:docs/sns/queue/FILE.md` 等で行える。停止・成否不明なら inflight を手で消して再投稿しない（3.3.1 から道具が毎 run の最初に媒体へ 1 回だけ問い合わせ、決まれば自分で解く）。止まり続けるなら `thth inflight <account> show` で中身を見て、媒体で確かめた人が `thth inflight <account> resolve --not-published|--published <post_id> --by <名前>` で解く（二段確認・MCP には無い）。復旧状態は投稿成功の保証ではなく、公開結果は status/post_id/posted_at を見る。
 
 `mentions <account> --json` は 3 媒体の言及を同じ項目で読む。返信前に `replied` の object／false／null を区別する。`unanswered <account> --since 7d --json` は自分の根投稿の未回答候補を台帳で読む。`cannot_say` と採集の古さを確認し、`--refresh` は明示されたときだけ使う。件数は account ごとに扱い、送信は既存の承認・digest・production の門を通す。
 

{thth-3.3.0 → thth-3.3.1}/tests/conftest.py

@@ -67,6 +67,16 @@ def local_http_test_transport(monkeypatch):
                 opener.open('http://'+host,timeout=0.01)
 
 
+@pytest.fixture(autouse=True)
+def no_threads_status_poll_wait(monkeypatch):
+    """公開の結果が分からないときの container の問い合わせ（設計 3.3.1 §2）を
+    試験では待たない。本番の既定は 20 秒おき・最大 3 回。偽サーバは status の
+    GET に答えない（`query_failed`）ので、従前の試験の結果（inflight を残す）は
+    変わらない——変わるのは待つ時間だけ。subprocess の `bin/thth` にも env で届く。
+    """
+    monkeypatch.setenv('THTH_THREADS_STATUS_POLL_SECONDS', '0')
+
+
 @pytest.fixture(autouse=True)
 def frozen_now_jst(monkeypatch):
     """`thth.jst.now_jst()` を既定で静かな時間帯の外（2026-09-09 10:00 JST）に固定する。

thth-3.3.1/tests/helpers/fake_threads_status.py

@@ -0,0 +1,123 @@
+"""container の status を答える偽 Threads（設計 3.3.1 §6・**tests の中だけ**）。
+
+本物の Threads API には触らない。`http.server` で次の 4 つの口だけを真似る:
+
+- `POST /<user>/threads`         → container を作る（id は `CONTAINER_ID`）
+- `POST /<user>/threads_publish` → `script.publish` の先頭から 1 つずつ答える
+- `GET  /<container>`            → `script.status` の先頭から 1 つずつ（最後の 1 つは繰り返す）
+- `GET  /v1.0/<user>/threads`    → `script.posts`（自分の最近の投稿）
+
+何回呼ばれたかを数える（`publish_calls`・`status_calls`・`list_calls`）——
+「2 度出していない」を回数で確かめるため。
+"""
+from __future__ import annotations
+
+import contextlib
+import dataclasses
+import http.server
+import json
+import threading
+import urllib.parse
+
+from thth.adapters import threads as threads_mod
+
+USER_ID = "12345"
+CONTAINER_ID = "900"
+
+
+@dataclasses.dataclass
+class Script:
+    # 公開の答え: ("ok", id) / (500, None) / (400, None) / ("drop", None)（接続断）
+    publish: list = dataclasses.field(default_factory=lambda: [("ok", "777")])
+    # container の status の答え: "FINISHED" などの語 / 数字（HTTP の失敗）
+    status: list = dataclasses.field(default_factory=lambda: ["FINISHED"])
+    # 自分の最近の投稿（`GET /v1.0/<user>/threads` の data）
+    posts: list = dataclasses.field(default_factory=list)
+    list_status: int = 200
+    publish_calls: int = 0
+    status_calls: int = 0
+    list_calls: int = 0
+    create_calls: int = 0
+    # 公開の要求に載っていた creation_id（どの container を公開したか）。
+    publish_ids: list = dataclasses.field(default_factory=list)
+
+
+def _handler(script: Script):
+    class Handler(http.server.BaseHTTPRequestHandler):
+        def _json(self, code, payload):
+            body = json.dumps(payload).encode("utf-8")
+            self.send_response(code)
+            self.send_header("Content-Type", "application/json")
+            self.send_header("Content-Length", str(len(body)))
+            self.end_headers()
+            self.wfile.write(body)
+
+        def do_POST(self):  # noqa: N802
+            length = int(self.headers.get("Content-Length") or 0)
+            raw = self.rfile.read(length) if length else b""
+            if self.path.endswith("/threads_publish"):
+                script.publish_calls += 1
+                params = urllib.parse.parse_qs(raw.decode("utf-8"))
+                script.publish_ids.append((params.get("creation_id") or [None])[0])
+                kind, value = (script.publish.pop(0) if script.publish else (500, None))
+                if kind == "ok":
+                    self._json(200, {"id": value})
+                elif kind == "drop":
+                    # 応答を返さずに切る（接続断）。
+                    self.close_connection = True
+                    self.connection.close()
+                else:
+                    self._json(kind, {"error": {"message": "fake", "code": 1,
+                                                "is_transient": True}})
+                return
+            script.create_calls += 1
+            self._json(200, {"id": CONTAINER_ID})
+
+        def do_GET(self):  # noqa: N802
+            path = urllib.parse.urlsplit(self.path).path
+            if path == f"/v1.0/{USER_ID}/threads":
+                script.list_calls += 1
+                if script.list_status != 200:
+                    self._json(script.list_status, {"error": {"message": "fake"}})
+                    return
+                self._json(200, {"data": list(script.posts)})
+                return
+            if path == f"/{CONTAINER_ID}":
+                script.status_calls += 1
+                answer = script.status.pop(0) if len(script.status) > 1 else script.status[0]
+                if isinstance(answer, int):
+                    self._json(answer, {"error": {"message": "fake"}})
+                else:
+                    self._json(200, {"status": answer, "id": CONTAINER_ID})
+                return
+            self._json(404, {"error": {"message": "not found"}})
+
+        def log_message(self, format, *args):  # noqa: A002
+            pass
+
+    return Handler
+
+
+@contextlib.contextmanager
+def serve(script: Script):
+    server = http.server.HTTPServer(("127.0.0.1", 0), _handler(script))
+    thread = threading.Thread(target=server.serve_forever, daemon=True)
+    thread.start()
+    try:
+        yield f"http://127.0.0.1:{server.server_port}"
+    finally:
+        server.shutdown()
+        thread.join(timeout=5)
+
+
+def adapter(base_url: str, **kwargs) -> threads_mod.ThreadsAdapter:
+    kwargs.setdefault("wait_seconds", 0)
+    kwargs.setdefault("timeout", 2.0)
+    kwargs.setdefault("status_poll_seconds", 0)
+    return threads_mod.ThreadsAdapter(base_url=base_url, access_token="fake-token",
+                                       user_id=USER_ID, **kwargs)
+
+
+def post_row(post_id: str, text: str, timestamp: str) -> dict:
+    return {"id": post_id, "text": text, "timestamp": timestamp,
+            "permalink": f"https://www.threads.net/@x/post/{post_id}"}

{thth-3.3.0 → thth-3.3.1}/tests/test_incident_notifications.py

@@ -76,7 +76,8 @@ def test_git_roundtrip_preserves_original_and_deduplicates(setup):
     assert "thth_run_state: recovered" in s.path.read_text()
     assert len(s.captured) == 4
     assert incident._fingerprint(s.path) == before
-    assert len(row(s)["events"]) == 1
+    # 3.3.1 §5: 送り終えた事象も 30 日は残す（以前は 1 件に畳んでいた）。
+    assert len(row(s)["events"]) == 2
 
 
 def test_initial_success_is_quiet(setup):
@@ -99,7 +100,8 @@ def test_role_failure_retries_only_unfinished_and_other_role_gets_recovery(setup
     monkeypatch.setattr(incident, "_send", lambda c, r, e, a: calls.append((r, e["state"])) or True)
     notify(s, "success", result=False)
     assert calls[-2:] == [("user@example.org", "blocked"), ("user@example.org", "recovered")]
-    assert len(row(s)["events"]) == 1
+    # 3.3.1 §5: 送り終えた事象も 30 日は残す（以前は 1 件に畳んでいた）。
+    assert len(row(s)["events"]) == 2
 
 
 def test_same_address_single_message(setup):

{thth-3.3.0 → thth-3.3.1}/tests/test_v210_json_contract.py

@@ -30,7 +30,9 @@ COMMANDS = '''lint|preview|approve|account|revoke|posts|replies|measured|threads
      'observe',
      # 3.1.2: 報告の口（設計 3.1.2 §1）。
      'report file', 'report list', 'report show', 'report add', 'admin reports list', 'admin reports show',
-     'admin reports reply', 'admin reports close', 'admin reports export']
+     'admin reports reply', 'admin reports close', 'admin reports export',
+     # 3.3.1 §4: 人の口 thth inflight（show|resolve・--json）。
+     'inflight']
 
 
 def test_json_table_covers_every_parser():

thth-3.3.1/tests/test_v331_inflight_cli.py

@@ -0,0 +1,156 @@
+"""3.3.1 §4: `thth inflight <account> [show|resolve] --by <名前>`（人の口）。
+
+09-23 に masaru が `inflight.json` を手で消した操作の代わり。二段確認・控え
+（`inflight.resolved-<日時>.json`）・変更ログ `inflight_resolved`。MCP には出さない。
+"""
+from __future__ import annotations
+
+import datetime
+import importlib.util
+import json
+import os
+import pathlib
+
+from tests.conftest import init_git_pair, make_queue_text, write_queue_file
+from tests.helpers import fake_threads_status as fake
+from thth import accounts as accounts_mod
+from thth import admin_log
+from thth import cli
+from thth import core
+from thth import inflight as inflight_mod
+from thth import inflight_cli
+from thth import queuefile
+from thth import runs as runs_mod
+
+NOW = datetime.datetime.fromisoformat("2026-09-09T10:00:00+09:00")
+REPO = pathlib.Path(__file__).resolve().parent.parent
+
+
+def _stuck(isolated_account_factory, tmp_path, *, git=True):
+    if git:
+        pair = init_git_pair(tmp_path, seed_content=make_queue_text(), seed_name="a.md")
+        account = isolated_account_factory(repo_dir=pair["work"], production=True)
+    else:
+        account = isolated_account_factory(production=True)
+        write_queue_file(account["queue_dir"], "a.md")
+    script = fake.Script(publish=[(500, None)], status=[503])
+    with fake.serve(script) as base_url:
+        result = core.throw_once(account["name"], production_flag=True,
+                                 adapter_factory=lambda c, t: fake.adapter(base_url), now=NOW)
+    assert result.action == "inflight"
+    return account, accounts_mod.state_dir_for(account["name"])
+
+
+def _cli(capsys, *argv):
+    rc = cli.main(["inflight", *argv])
+    out = capsys.readouterr()
+    return rc, out.out, out.err
+
+
+def _digest_from(out):
+    return next(line.split(": ", 1)[1] for line in out.splitlines() if line.startswith("digest: "))
+
+
+def test_showは中身を出すが本文とtokenとcontainer_idは出さない(isolated_account_factory, tmp_path, capsys):
+    account, state_dir = _stuck(isolated_account_factory, tmp_path)
+    rc, out, _ = _cli(capsys, account["name"], "show")
+    assert rc == 0
+    assert "a.md" in out and "container_id: あり" in out and "query_failed" in out
+    assert "本文です" not in out and "fake-token" not in out and fake.CONTAINER_ID not in out
+    rc, out, _ = _cli(capsys, account["name"], "show", "--json")
+    info = json.loads(out)["inflight"]
+    assert info["container_id_present"] is True and info["remote_state"] == "query_failed"
+    assert info["post_id_present"] is False and info["self_resolvable"] is True
+
+
+def test_showはinflightが無ければそう言う(isolated_account_factory, capsys):
+    account = isolated_account_factory()
+    rc, out, _ = _cli(capsys, account["name"])
+    assert rc == 0 and "inflight はありません" in out
+
+
+def test_resolve_not_publishedの往復_二段確認と控えと変更ログ(isolated_account_factory, tmp_path, capsys):
+    account, state_dir = _stuck(isolated_account_factory, tmp_path, git=False)
+    before = inflight_mod.read(state_dir)
+    # 一段目: 何もしない。
+    rc, out, _ = _cli(capsys, account["name"], "resolve", "--not-published", "--by", "masaru")
+    assert rc == 1 and "解きません" in out
+    assert inflight_mod.read(state_dir) == before
+    code = _digest_from(out)
+    # 二段目。
+    rc, out, _ = _cli(capsys, account["name"], "resolve", "--not-published", "--by", "masaru",
+                      "--confirm", code)
+    assert rc == 0, out
+    assert inflight_mod.read(state_dir) is None
+    archives = inflight_mod.archives(state_dir)
+    assert len(archives) == 1
+    saved = json.loads(open(archives[0], encoding="utf-8").read())
+    assert saved["resolved_by"] == "masaru" and saved["resolution"] == "human_not_published"
+    assert saved["inflight"]["started"] == before["started"]
+    assert os.stat(archives[0]).st_mode & 0o777 == 0o600
+    rows, broken = admin_log.read(account=account["name"], event="inflight_resolved")
+    assert len(rows) == 1 and rows[0]["by"] == "masaru" and not broken
+    runs = [r for r in runs_mod.read_runs(state_dir) if r.get("inflight_resolution")]
+    assert runs[-1]["inflight_resolution"] == "human_not_published"
+    # 原稿は approved のまま（次の run が出し直す）。
+    qf = queuefile.parse(os.path.join(account["queue_dir"], "a.md"))
+    assert qf.get("status") == "approved"
+
+
+def test_resolve_publishedは書き戻して解く(isolated_account_factory, tmp_path, capsys):
+    account, state_dir = _stuck(isolated_account_factory, tmp_path)
+    rc, out, _ = _cli(capsys, account["name"], "resolve", "--published", "8001", "--by", "masaru")
+    assert rc == 1
+    rc, out, err = _cli(capsys, account["name"], "resolve", "--published", "8001", "--by", "masaru",
+                        "--confirm", _digest_from(out))
+    assert rc == 0, err
+    assert inflight_mod.read(state_dir) is None
+    qf = queuefile.parse(os.path.join(account["queue_dir"], "a.md"))
+    assert qf.get("status") == "posted" and str(qf.get("post_id")) == "8001"
+    assert len(inflight_mod.archives(state_dir)) == 1
+    rows, _ = admin_log.read(account=account["name"], event="inflight_resolved")
+    assert rows[-1]["diff"]["resolution"] == [None, "human_published"]
+
+
+def test_digestが違えば解かない_別のinflightには流用できない(isolated_account_factory, tmp_path, capsys):
+    account, state_dir = _stuck(isolated_account_factory, tmp_path, git=False)
+    rc, out, _ = _cli(capsys, account["name"], "resolve", "--not-published", "--by", "masaru")
+    code = _digest_from(out)
+    inflight_mod.update(state_dir, started="2026-09-09T11:00:00+09:00")
+    rc, _, err = _cli(capsys, account["name"], "resolve", "--not-published", "--by", "masaru",
+                      "--confirm", code)
+    assert rc == 1 and "confirm_mismatch" in err
+    assert inflight_mod.read(state_dir) is not None and inflight_mod.archives(state_dir) == []
+
+
+def test_byと決めることが無ければ断る(isolated_account_factory, tmp_path, capsys, monkeypatch):
+    monkeypatch.delenv("THTH_ACTOR", raising=False)
+    account, state_dir = _stuck(isolated_account_factory, tmp_path, git=False)
+    rc, _, err = _cli(capsys, account["name"], "resolve", "--not-published")
+    assert rc == 1 and err.startswith("by_required")
+    rc, _, err = _cli(capsys, account["name"], "resolve", "--by", "masaru")
+    assert rc == 1 and err.startswith("decision_required")
+    assert inflight_mod.read(state_dir) is not None
+
+
+def test_出たと分かっているinflightはnot_publishedで解かない(isolated_account_factory, tmp_path, capsys):
+    account, state_dir = _stuck(isolated_account_factory, tmp_path, git=False)
+    inflight_mod.update(state_dir, post_id="8002")
+    rc, _, err = _cli(capsys, account["name"], "resolve", "--not-published", "--by", "masaru")
+    assert rc == 1 and err.startswith("published_known")
+    rc, _, err = _cli(capsys, account["name"], "resolve", "--published", "9999", "--by", "masaru")
+    assert rc == 1 and err.startswith("post_id_differs")
+
+
+def test_添付のinflightはこの口では解かない(isolated_account_factory, tmp_path, capsys):
+    account, state_dir = _stuck(isolated_account_factory, tmp_path, git=False)
+    record = inflight_mod.read(state_dir)
+    info = inflight_cli.summary({**record, "media": {"account": account["name"]}})
+    assert info["media"] is True and info["self_resolvable"] is False
+
+
+def test_mcpにはinflightの口が無い():
+    spec = importlib.util.spec_from_file_location("thth_mcp_server", REPO / "mcp" / "server.py")
+    server = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(server)
+    assert not any("inflight" in tool["name"] for tool in server.TOOLS)

thth-3.3.1/tests/test_v331_listing_resolve.py

@@ -0,0 +1,136 @@
+"""3.3.1 §3 の後段: container の無い媒体（Mastodon・Bluesky・X）の自己解決。
+
+自分の最近の投稿を公開時刻の前後 10 分で引き、本文の指紋が一致する投稿が
+**ちょうど 1 件**なら書き戻して解く。**0 件なら解かない**——出ていないと
+言い切れない媒体がある（本文を変えて返す・索引が遅れる）。2 件でも決めない。
+"""
+from __future__ import annotations
+
+import datetime
+import os
+
+from tests.conftest import init_git_pair, make_queue_text
+from thth import accounts as accounts_mod
+from thth import core
+from thth import inflight as inflight_mod
+from thth import queuefile
+from thth import runs as runs_mod
+from thth.adapters import base as adapter_base
+
+NOW = datetime.datetime.fromisoformat("2026-09-09T10:00:00+09:00")
+BODY = "## mastodon\n\n本文です。\n"
+NEAR = "2026-09-09T01:02:00.000Z"
+FAR = "2026-09-09T00:40:00.000Z"
+
+
+class ListOnlyAdapter(adapter_base.Adapter):
+    """container を持たない媒体の偽物。公開は「分からない」で終わり、一覧だけ返す。"""
+
+    CAPABILITIES = frozenset({"recent_posts"})
+
+    def __init__(self, *, rows=None, fail=False):
+        self.rows = rows or []
+        self.fail = fail
+        self.publish_calls = 0
+        self.list_calls = 0
+
+    def publish(self, post, *, dry_run, on_container_created=None, before_publish=None):
+        self.publish_calls += 1
+        return adapter_base.PublishResult(None, None, "2026-09-09T10:00:00+09:00",
+                                          error="公開失敗: timed out",
+                                          failure="publish_ambiguous")
+
+    def recent_posts(self, *, limit=25):
+        self.list_calls += 1
+        if self.fail:
+            raise adapter_base.AdapterError("fake_list_failed")
+        return list(self.rows)
+
+
+def _row(post_id, text, ts):
+    return {"post_id": post_id, "timestamp": ts, "url": None, "text": text, "topic": None}
+
+
+def _stuck(isolated_account_factory, tmp_path):
+    seed = make_queue_text(body=BODY, media="mastodon")
+    pair = init_git_pair(tmp_path, seed_content=seed, seed_name="a.md")
+    account = isolated_account_factory(repo_dir=pair["work"], production=True,
+                                       media="mastodon", instance="https://mastodon.example")
+    state_dir = accounts_mod.state_dir_for(account["name"])
+    first = ListOnlyAdapter()
+    result = core.throw_once(account["name"], production_flag=True,
+                             adapter_factory=lambda c, t: first, now=NOW)
+    assert result.action == "inflight"
+    left = inflight_mod.read(state_dir)
+    assert left["container_id"] is None and left["text_fingerprint"]
+    return account, state_dir
+
+
+def _again(account, adapter):
+    return core.throw_once(account["name"], production_flag=True,
+                           adapter_factory=lambda c, t: adapter, now=NOW)
+
+
+def test_一覧に1件あれば書き戻して解き_出し直さない(isolated_account_factory, tmp_path):
+    account, state_dir = _stuck(isolated_account_factory, tmp_path)
+    adapter = ListOnlyAdapter(rows=[_row("m-1", "本文です。", NEAR),
+                                    _row("m-2", "本文です。", FAR),
+                                    _row("m-3", "別の本文", NEAR)])
+    result = _again(account, adapter)
+    assert adapter.publish_calls == 0                 # 2 度出していない
+    assert inflight_mod.read(state_dir) is None
+    qf = queuefile.parse(os.path.join(account["queue_dir"], "a.md"))
+    assert qf.get("status") == "posted" and qf.get("post_id") == "m-1"
+    rows = runs_mod.read_runs(state_dir)
+    assert any(r.get("inflight_resolution") == "listing_located" and r["post_id"] == "m-1"
+               for r in rows)
+    assert len(inflight_mod.archives(state_dir)) == 1
+    assert result.action in ("none", "post")
+
+
+def test_空白や改行を詰め直された本文も同じと見る(isolated_account_factory, tmp_path):
+    account, state_dir = _stuck(isolated_account_factory, tmp_path)
+    adapter = ListOnlyAdapter(rows=[_row("m-4", "\n本文です。  \n", NEAR)])
+    _again(account, adapter)
+    assert inflight_mod.read(state_dir) is None
+
+
+def test_0件なら解かない(isolated_account_factory, tmp_path):
+    account, state_dir = _stuck(isolated_account_factory, tmp_path)
+    adapter = ListOnlyAdapter(rows=[_row("m-2", "本文です。", FAR)])
+    result = _again(account, adapter)
+    assert result.action == "inflight" and result.error == "inflight_unresolved"
+    assert adapter.publish_calls == 0
+    left = inflight_mod.read(state_dir)
+    assert left["remote_state"] == "listing_none"
+    assert inflight_mod.archives(state_dir) == []
+
+
+def test_2件なら決めない(isolated_account_factory, tmp_path):
+    account, state_dir = _stuck(isolated_account_factory, tmp_path)
+    adapter = ListOnlyAdapter(rows=[_row("m-5", "本文です。", NEAR), _row("m-6", "本文です。", NEAR)])
+    result = _again(account, adapter)
+    assert result.action == "inflight" and adapter.publish_calls == 0
+    assert inflight_mod.read(state_dir)["remote_state"] == "listing_many"
+
+
+def test_一覧が引けなければ解かない(isolated_account_factory, tmp_path):
+    account, state_dir = _stuck(isolated_account_factory, tmp_path)
+    adapter = ListOnlyAdapter(fail=True)
+    result = _again(account, adapter)
+    assert result.action == "inflight" and adapter.publish_calls == 0
+    assert inflight_mod.read(state_dir)["remote_state"] == "listing_failed"
+
+
+def test_指紋の無い古いinflightは訊かずに従前どおり止まる(isolated_account_factory, tmp_path):
+    account, state_dir = _stuck(isolated_account_factory, tmp_path)
+    record = inflight_mod.read(state_dir)
+    record.pop("text_fingerprint")
+    inflight_mod.clear(state_dir)
+    inflight_mod.write(state_dir, **{k: record[k] for k in (
+        "file", "started", "container_id", "post_id", "body_hash", "approved_fingerprint")})
+    adapter = ListOnlyAdapter(rows=[_row("m-1", "本文です。", NEAR)])
+    result = _again(account, adapter)
+    assert result.action == "inflight" and result.error is None
+    assert adapter.list_calls == 0
+

thth-3.3.1/tests/test_v331_outbox_retention.py

@@ -0,0 +1,135 @@
+"""3.3.1 §5: 運用通知の事象を 30 日残し、「最後に送った運用通知」を board と observe に出す。
+
+09-22 の停止の通知は outbox から消えていて、送ったかどうかを翌日に言えなかった。
+届いたかどうかは道具には分からない（SMTP の受領は到達ではない）——人が受信箱と
+照合できるよう、時刻・状態・受領した役割を残す。宛先は出さない。
+"""
+from __future__ import annotations
+
+import json
+import os
+
+import pytest
+
+from tests.test_incident_notifications import notify, row, setup  # noqa: F401 — fixture
+from thth import accounts, cli, incident, morning
+
+
+def _save_row(s, value):
+    incident._save(os.path.join(s.state, incident.STATE_FILE), value)
+
+
+def test_送り終えた事象を残し最後に送った通知を控える(setup):
+    s = setup
+    notify(s)
+    notify(s, "success", result=False)
+    value = row(s)
+    assert [e["state"] for e in value["events"]] == ["blocked", "recovered"]
+    sent = value["last_sent"]
+    assert sent["state"] == "recovered" and sent["roles"] == ["admin", "user"]
+    assert sent["reason"] == "healthy" and sent["at"]
+    # 宛先は控えない。
+    assert "example.org" not in json.dumps(sent)
+    summary = incident.summary(s.cfg, s.state)["last_sent"]
+    assert summary["basis"] == "recorded" and summary["state"] == "recovered"
+
+
+def test_30日を過ぎた送り終えた事象は畳む_最後の1件は残す(setup):
+    s = setup
+    notify(s)
+    notify(s, "success", result=False)
+    value = row(s)
+    for event in value["events"]:
+        event["at"] = "2026-07-01T10:00:00+09:00"
+    _save_row(s, value)
+    notify(s, "success", result=False)   # 遷移なし・畳むだけ
+    assert len(row(s)["events"]) == 1
+    assert row(s)["last_sent"]["state"] == "recovered"   # 控えは畳まれても残る
+
+
+def test_送り終えていない事象は古くても畳まない(setup, monkeypatch):
+    s = setup
+    notify(s)
+    value = row(s)
+    value["events"][0]["accepted"] = {}
+    value["events"][0]["at"] = "2026-07-01T10:00:00+09:00"
+    value["events"].append(dict(value["events"][0], id="f" * 32, accepted={}))
+    _save_row(s, value)
+    # SMTP が受け付けない（両方失敗）まま流す。
+    monkeypatch.setattr(incident, "_send", lambda *a, **k: False)
+    notify(s)
+    assert len(row(s)["events"]) == 2
+
+
+def test_30日以内でも数が溢れたら古い順に畳む(setup):
+    s = setup
+    notify(s)
+    value = row(s)
+    template = value["events"][0]
+    value["events"] = [dict(template, id=f"{i:032x}") for i in range(60)]
+    _save_row(s, value)
+    notify(s)   # 同じ停止（遷移なし）
+    assert len(row(s)["events"]) == incident.RETENTION_CAP
+
+
+def test_控えの無い古いoutboxは残っている事象から言う(setup):
+    s = setup
+    notify(s)
+    value = row(s)
+    value.pop("last_sent")
+    _save_row(s, value)
+    summary = incident.last_sent(row(s))
+    assert summary["basis"] == "event_at" and summary["state"] == "blocked"
+    assert "事象の時刻" in incident.last_sent_line(summary)
+
+
+def test_送った記録が無ければ記録なしと言う():
+    assert incident.last_sent({"events": []}) is None
+    assert "記録なし" in incident.last_sent_line(None)
+
+
+def test_壊れた控えはoutboxを壊れたものとして扱う(setup):
+    s = setup
+    notify(s)
+    value = row(s)
+    value["last_sent"] = {"at": "x", "state": "blocked", "reason": "healthy", "roles": ["user"]}
+    with pytest.raises(ValueError):
+        incident._validate(value)
+    value["last_sent"] = {"at": "2026-09-09T10:00:00+09:00", "state": "blocked",
+                          "reason": "healthy", "roles": ["someone@example.org"]}
+    with pytest.raises(ValueError):
+        incident._validate(value)
+
+
+def _outbox_for(account_name, sent):
+    state = accounts.state_dir_for(account_name)
+    incident._save(os.path.join(state, incident.STATE_FILE), {
+        "version": 1, "last": "success", "events": [], "last_sent": sent})
+
+
+SENT = {"at": "2026-09-22T20:05:00+09:00", "state": "blocked", "reason": "publish_http_500",
+        "event_at": "2026-09-22T20:04:00+09:00", "roles": ["admin", "user"]}
+
+
+def test_boardに最後に送った運用通知が出る(isolated_account, capsys):
+    _outbox_for(isolated_account["name"], SENT)
+    assert cli.main(["board"]) == 0
+    out = capsys.readouterr().out
+    line = next(l for l in out.splitlines() if l.strip().startswith("最後に送った運用通知:"))
+    assert "2026-09-22T20:05:00+09:00" in line and "blocked" in line and "admin・user" in line
+    assert cli.main(["board", "--json"]) == 0
+    payload = json.loads(capsys.readouterr().out)
+    acct = next(r for r in payload["accounts"] if r["account"] == isolated_account["name"])
+    assert acct["incident_notifications"]["last_sent"]["roles"] == ["admin", "user"]
+
+
+def test_observeに最後に送った運用通知が出る(isolated_account):
+    _outbox_for(isolated_account["name"], SENT)
+    payload = morning.build(isolated_account["name"], mark=False)
+    today = next(sec for sec in payload["sections"] if sec["section"] == "today")
+    node = today["value"]["by_account"][isolated_account["name"]]["value"]
+    cell = node["last_notification"]
+    assert cell["cannot_say"] is None and cell["value"]["state"] == "blocked"
+    lines = []
+    morning.render(payload, out=lines.append)
+    assert any("最後に送った運用通知" in l and "publish_http_500" in l for l in lines)