thth 3.1.2__tar.gz → 3.2.0__tar.gz

{thth-3.1.2 → thth-3.2.0}/PKG-INFO

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

{thth-3.1.2 → thth-3.2.0}/mcp/server.py

@@ -608,6 +608,14 @@ REPORT_TOOLS = [
      "description": "報告 1 件の本文と実装側の返事を読む（読むだけ）",
      "inputSchema": {"type": "object", "properties": {"report_id": {"type": "string"}},
                      "required": ["report_id"], "additionalProperties": False}},
+    # 報告した側の追記（設計 3.2.0 §4.5-1）。
+    {"name": "thth_report_add",
+     "description": "自分の project の開いている報告に書き足す（返事と同じ列に並ぶ・4,000 字まで・"
+                    "閉じた報告には足せない・秘密らしき値が含まれていたら足さない）",
+     "inputSchema": {"type": "object", "properties": {
+         "report_id": {"type": "string"},
+         "text": {"type": "string", "description": "4,000 字まで"}},
+         "required": ["report_id", "text"], "additionalProperties": False}},
 ]
 
 
@@ -681,7 +689,7 @@ def server_call(name, arguments):
         elif operation.startswith('admin_reports_'):
             from thth.report_service import execute_admin_reports
             result=execute_admin_reports(context,request)
-        elif operation in ('report_file','report_list','report_show'):
+        elif operation in ('report_file','report_list','report_show','report_add'):
             from thth.report_service import execute_user_reports
             result=execute_user_reports(context,request)
         elif operation=='morning':

{thth-3.1.2 → thth-3.2.0}/skills/thth/SKILL.md

@@ -108,6 +108,12 @@ found_by: where_to_appear|manual|mention
 untracked/コミット前のファイル）。語を選ぶときだけ `before_you_post`
 （原稿本文は渡さない・件数と期間つきで返す）。
 
+**まだ出ていない自分の原稿へ返すとき（3.2.0）**: `reply_to` の代わりに
+`reply_to_file: <同じ queue・同じ account の原稿のファイル名>` と書く（パスは書けない・
+`reply_to` との併用不可）。指した原稿が出るまで待ち、出たらその post_id に返す——
+**root には落とさない**。待っている間は `thth board`・`thth morning` に「返信待ち」として
+名前と待ち先が出る（時刻超過には数えない）。承認の指紋は `file:<名前>`。
+
 ### 5. 承認——二段（そのまま）
 
 ```bash
@@ -144,6 +150,7 @@ MCP `after_you_posted`。**24h の刻みが無ければ `null`**（0 と混ぜ
 - `thth --help` / `thth <subcommand> --help` が正本。
 - `thth doctor <account>` が「いま投稿できる状態か」を最初から最後まで言う。
 - 道具の不具合・欲しい形は `thth report file`（MCP `thth_report_file`）で実装側に届ける。
+- 自分の開いている報告に書き足すなら `thth report add <report_id> --body-file <path|-> --by <名前>`（MCP `thth_report_add`）。
 - 使い方の全文: `docs/使い方_プロジェクトのセッション向け_2026-09-09.md`。
 
 ## 運用と分析のレポート（v3系・2.5.0 から）

{thth-3.1.2 → thth-3.2.0}/tests/conftest.py

@@ -35,8 +35,10 @@ DEFAULT_FM = {
     "posted_at": None,
 }
 
+# `reply_to_file`（設計 3.2.0）・`retracted_at` は既定の front-matter に入れない
+# （`fm_overrides` で渡したときだけ書く）——既存の試験の原稿を 1 行も変えないため。
 FM_ORDER = ["thth", "account", "publish_at", "status", "approved_sha", "approved_at",
-            "topic", "reply_to", "post_id", "posted_at"]
+            "topic", "reply_to", "reply_to_file", "post_id", "posted_at", "retracted_at"]
 
 # quiet_hours の既定（22:00〜07:00）の外にある値。frozen_now_jst() の既定値に使う。
 FIXED_NOW_JST = datetime.datetime(2026, 9, 9, 10, 0, 0, tzinfo=jst.JST)
@@ -143,7 +145,7 @@ def make_queue_text(fm_overrides=None, body="## threads\n\n本文です。\n",
                 try:
                     fm["approved_sha"] = approval_mod.compute_approved_sha(
                         section=section, account=fm.get("account"),
-                        reply_to=fm.get("reply_to"), topic=fm.get("topic"),
+                        reply_to=approval_mod.reply_to_for_fingerprint(fm), topic=fm.get("topic"),
                         publish_at=publish_at)
                 except ValueError:
                     pass  # publish_at が壊れている型外テスト等: 計算できないので触らない

{thth-3.1.2 → thth-3.2.0}/tests/test_v210_json_contract.py

@@ -27,7 +27,7 @@ COMMANDS = '''lint|preview|approve|account|revoke|posts|replies|measured|threads
      # 3.1.0: 毎朝の一枚と監視語（設計 3.1.0 §1・§3）。
      'morning', 'admin watch set', 'admin watch show',
      # 3.1.2: 報告の口（設計 3.1.2 §1）。
-     'report file', 'report list', 'report show', 'admin reports list', 'admin reports show',
+     'report file', 'report list', 'report show', 'report add', 'admin reports list', 'admin reports show',
      'admin reports reply', 'admin reports close', 'admin reports export']
 
 

thth-3.2.0/tests/test_v320_reply_to_file_display.py

@@ -0,0 +1,146 @@
+"""3.2.0 `reply_to_file` の見せ方（設計 3.2.0 §2・§4・§6）。
+
+待ちは**時刻超過に数えない**。代わりに「返信待ち」として数え、board の要確認と
+morning の予定の段に**待っている原稿の名前と待ち先**を出す。handoff の queue に
+`waiting_reply` の数。`thth preview` は「返信先: <file>（未解決・待ち）」または
+「返信先: <file> → <post_id>」。
+"""
+from __future__ import annotations
+
+import datetime
+import json
+
+from tests.conftest import run_thth, write_queue_file
+from tests.test_v310_morning import ACCOUNT, NOW, PROJECT, one, sections  # noqa: F401
+from thth import lint as lint_mod
+from thth import morning
+from thth import operations_handoff as handoff
+from thth import report as report_mod
+
+Q = "q.md"
+A = "a.md"
+Q_POST_ID = "17900000000000001"
+BOARD_NOW = datetime.datetime(2026, 9, 9, 10, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(hours=9)))
+
+
+def _question(queue_dir, *, posted, account=None, publish_at="2026-09-09T05:00:00+09:00"):
+    fm = {"publish_at": publish_at}
+    if account:
+        fm["account"] = account
+    if posted:
+        fm.update(status="posted", post_id=Q_POST_ID, posted_at=publish_at)
+    return write_queue_file(queue_dir, Q, fm_overrides=fm, body="## threads\n\n問い\n")
+
+
+def _answer(queue_dir, *, account=None, publish_at="2026-09-09T07:00:00+09:00"):
+    fm = {"reply_to_file": Q, "publish_at": publish_at}
+    if account:
+        fm["account"] = account
+    return write_queue_file(queue_dir, A, fm_overrides=fm, body="## threads\n\n答え\n")
+
+
+# ---------------------------------------------------------------- board
+
+def test_boardは待ちを時刻超過に数えず名前と待ち先を出す(isolated_account):
+    qdir = isolated_account["queue_dir"]
+    # 問いは承認済みだが未来（まだ出ない）・答えは 3 時間前の予定（時刻は過ぎている）。
+    _question(qdir, posted=False, publish_at="2026-09-09T23:00:00+09:00")
+    _answer(qdir)
+    summary = report_mod.board_summary(now=BOARD_NOW)
+    row = next(r for r in summary["accounts"] if r["account"] == isolated_account["name"])
+    assert row["waiting_items"] == [{"file": A, "waiting_for": Q}]
+    assert row["waiting_reply_count"] == 1
+    reasons = {item["file"]: item["reason"] for item in row["needs_review"]}
+    assert reasons[A] == "reply_to_unresolved: waiting_for q.md"
+    assert not any(item["reason"] in ("overdue", "rehearsal") for item in row["needs_review"])
+
+
+def test_boardの文面に返信待ちが出る(isolated_account):
+    qdir = isolated_account["queue_dir"]
+    _question(qdir, posted=False, publish_at="2030-01-01T23:00:00+09:00")
+    _answer(qdir, publish_at="2020-01-01T08:00:00+09:00")
+    result = run_thth(["board"])
+    assert result.returncode == 0, result.stderr
+    assert "返信待ち 1 件" in result.stdout
+    assert f"{A} — 返信待ち: {Q} が出たら返信します" in result.stdout
+
+
+def test_queueとscheduleにも待ちが出る(isolated_account):
+    qdir = isolated_account["queue_dir"]
+    _question(qdir, posted=False, publish_at="2030-01-01T23:00:00+09:00")
+    _answer(qdir, publish_at="2020-01-01T08:00:00+09:00")
+    info = report_mod.queue_summary(isolated_account["name"], now=BOARD_NOW)[isolated_account["name"]]
+    assert info["waiting_reply"] == 1
+    rows = {row["file"]: row for row in report_mod.schedule(isolated_account["name"], now=BOARD_NOW)}
+    assert rows[A]["reply_to_file"] == Q and rows[A]["waiting_for"] == Q
+    shown = run_thth(["schedule", isolated_account["name"]])
+    assert f"← 返信待ち: {Q}" in shown.stdout
+
+
+# ---------------------------------------------------------------- handoff
+
+def test_handoffは待ちをwaiting_replyに数えoverdueに数えない(isolated_account):
+    qdir = isolated_account["queue_dir"]
+    _question(qdir, posted=False, publish_at="2026-09-09T23:00:00+09:00")
+    _answer(qdir, publish_at="2026-09-09T05:00:00+09:00")          # 5 時間超過
+    name = isolated_account["name"]
+    counts = handoff.answer(name, now=BOARD_NOW)["by_account"][name]["queue"]["counts"]
+    assert counts["waiting_reply"] == 1
+    assert counts["overdue"] == 0
+    assert counts["approved_waiting"] == 2
+
+
+def test_handoffは解決した答えが遅れていれば時刻超過に数える(isolated_account):
+    qdir = isolated_account["queue_dir"]
+    _question(qdir, posted=True)
+    _answer(qdir, publish_at="2026-09-09T05:00:00+09:00")
+    name = isolated_account["name"]
+    counts = handoff.answer(name, now=BOARD_NOW)["by_account"][name]["queue"]["counts"]
+    assert counts["waiting_reply"] == 0
+    assert counts["overdue"] == 1
+
+
+# ---------------------------------------------------------------- morning
+
+def test_morningは返信待ちを予定の段に名前と待ち先で出す(one):
+    qdir = one["queue_dir"]
+    _question(qdir, posted=False, account=ACCOUNT, publish_at="2026-09-23T23:00:00+09:00")
+    _answer(qdir, account=ACCOUNT, publish_at="2026-09-23T05:00:00+09:00")   # 2h 超過
+    payload = morning.build(PROJECT, now=NOW, mark=False)
+    today = sections(payload)["today"]["value"]["by_account"][ACCOUNT]["value"]
+    assert today["overdue_items"]["value"]["n"] == 0, "待ちは時刻超過に数えない"
+    waiting = today["waiting_items"]["value"]
+    assert waiting["n"] == 1
+    [row] = waiting["items"]
+    assert row["file"] == A and row["waiting_for"] == Q
+    assert row["reason"] == "reply_to_unresolved: waiting_for q.md"
+    assert today["queue"]["value"]["waiting_reply"] == 1
+    assert today["queue"]["value"]["overdue"] == 0
+    assert not [s for s in sections(payload)["next_steps"]["value"]["steps"]
+                if s["kind"] == "overdue" and s["file"] == A]
+    lines = []
+    morning.render(payload, out=lines.append)
+    assert any(f"返信待ち: {A} → {Q} が出たら返信します" in line for line in lines)
+    assert any("返信待ち 1" in line for line in lines)
+
+
+# ---------------------------------------------------------------- preview
+
+def test_previewは返信先の原稿と解決の見込みを出す(isolated_account):
+    qdir = isolated_account["queue_dir"]
+    _question(qdir, posted=False)
+    path = _answer(qdir)
+    assert lint_mod.preview_file(path).endswith("\n返信先: q.md（未解決・待ち）")
+    _question(qdir, posted=True)
+    assert lint_mod.preview_file(path) == f"答え\n返信先: q.md → {Q_POST_ID}"
+    shown = run_thth(["preview", path, "--json"])
+    payload = json.loads(shown.stdout)
+    assert payload["reply_to_file"] == Q and payload["reply_to"] == Q_POST_ID
+    assert payload["unresolved"] is None
+
+
+def test_reply_to_fileの無い原稿のpreviewは変わらない(isolated_account):
+    path = write_queue_file(isolated_account["queue_dir"], "plain.md")
+    assert lint_mod.preview_file(path) == "本文です。"
+    payload = json.loads(run_thth(["preview", path, "--json"]).stdout)
+    assert set(payload) == {"file", "text", "topic"}

thth-3.2.0/tests/test_v320_reply_to_file_lint.py

@@ -0,0 +1,122 @@
+"""3.2.0 `reply_to_file` の lint（設計 3.2.0 §1・§6「lint 6 種」）。
+
+返信先を post_id ではなく**同じ queue の原稿の名前**で書く。書き方が誤っていれば
+loud に断る（併用・自己参照・不在・account 違い・名前の形・束）。**指した原稿が
+まだ出ていないこと自体は断らない**——それは待つのであって誤りではない（§2）。
+"""
+from __future__ import annotations
+
+import os
+
+import pytest
+
+from tests.conftest import write_queue_file
+from thth import lint as lint_mod
+from thth import queuefile
+
+Q = "2026-09-23-q-decaf.md"
+A = "2026-09-24-a-decaf.md"
+
+
+def _errors(path):
+    return [e for e in lint_mod.lint_file(path) if not lint_mod.is_warning(e)]
+
+
+def _pair(tmp_path, *, answer_fm=None, question_fm=None, question_text=None):
+    queue = str(tmp_path / "queue")
+    if question_text is not None:
+        os.makedirs(queue, exist_ok=True)
+        with open(os.path.join(queue, Q), "w", encoding="utf-8") as f:
+            f.write(question_text)
+    else:
+        write_queue_file(queue, Q, commit=False,
+                         fm_overrides={"status": "draft", **(question_fm or {})},
+                         body="## threads\n\n今日の問い。\n")
+    return write_queue_file(queue, A, commit=False,
+                            fm_overrides={"status": "draft", "reply_to_file": Q,
+                                          **(answer_fm or {})},
+                            body="## threads\n\n明日の答え。\n")
+
+
+def test_まだ出ていない同じaccountの原稿を指すのは通る(isolated_account, tmp_path):
+    """指した原稿が draft（post_id 無し）でも lint は通す——待つのは誤りではない。"""
+    assert _errors(_pair(tmp_path)) == []
+
+
+def test_reply_toとの併用は断る(isolated_account, tmp_path):
+    path = _pair(tmp_path, answer_fm={"reply_to": "18000000000000001"})
+    errors = _errors(path)
+    assert any(e.startswith("reply_to_conflict: ") for e in errors), errors
+    assert lint_mod.reason_code(errors) == "reply_to_conflict"
+
+
+def test_自分自身を指すのは断る(isolated_account, tmp_path):
+    path = _pair(tmp_path, answer_fm={"reply_to_file": A})
+    errors = _errors(path)
+    assert any(e.startswith("reply_to_file_self: ") for e in errors), errors
+    assert lint_mod.reason_code(errors) == "reply_to_file_self"
+
+
+def test_指した原稿が無いのは断る(isolated_account, tmp_path):
+    path = _pair(tmp_path, answer_fm={"reply_to_file": "2026-09-22-nothing.md"})
+    errors = _errors(path)
+    assert any(e.startswith("reply_to_file_missing: ") for e in errors), errors
+    assert lint_mod.reason_code(errors) == "reply_to_file_missing"
+
+
+def test_指した原稿のaccountが違うのは断る(isolated_account, tmp_path):
+    path = _pair(tmp_path, question_fm={"account": "kopicha-threads"})
+    errors = _errors(path)
+    assert any(e.startswith("reply_to_file_account_mismatch: ") for e in errors), errors
+    assert lint_mod.reason_code(errors) == "reply_to_file_account_mismatch"
+
+
+@pytest.mark.parametrize("name", [
+    "../" + Q, "sub/" + Q, "sub\\" + Q, "2026-09-23-q-decaf.txt", ".md",
+    ".hidden.md", "a..b.md",
+])
+def test_名前の形が違うのは断る(isolated_account, tmp_path, name):
+    path = _pair(tmp_path, answer_fm={"reply_to_file": name})
+    errors = _errors(path)
+    assert any(e.startswith("reply_to_file_invalid: ") for e in errors), (name, errors)
+    assert lint_mod.reason_code(errors) == "reply_to_file_invalid"
+
+
+def test_reply_toにfile印を書くのは断る(isolated_account, tmp_path):
+    """`reply_to: file:<名前>` は reply_to_file と同じ指紋になるので書かせない（§3）。"""
+    queue = str(tmp_path / "queue")
+    path = write_queue_file(queue, A, commit=False,
+                            fm_overrides={"status": "draft", "reply_to": "file:" + Q})
+    errors = _errors(path)
+    assert lint_mod.reason_code(errors) == "reply_to_file_invalid", errors
+
+
+def test_束の原稿は指せない(isolated_account, tmp_path):
+    bundle_text = ("---\nthth: 2\naccount: nigamilab-threads\n"
+                   "publish_at: 2026-09-23T23:00:00+09:00\nstatus: draft\n---\n"
+                   "## threads\n\n一段目\n")
+    path = _pair(tmp_path, question_text=bundle_text)
+    errors = _errors(path)
+    assert any(e.startswith("reply_to_file_bundle_unsupported: ") for e in errors), errors
+    assert lint_mod.reason_code(errors) == "reply_to_file_bundle_unsupported"
+
+
+def test_指した原稿が型外なら読めないと言う(isolated_account, tmp_path):
+    path = _pair(tmp_path, question_text="front-matter の無い素の原稿\n")
+    errors = _errors(path)
+    assert any(e.startswith("reply_to_file_unreadable: ") for e in errors), errors
+
+
+def test_指した原稿がさらにreply_to_fileを持っていてもよい(isolated_account, tmp_path):
+    """答えへの補足（指した原稿がさらに reply_to_file を持つ）は通る（§1）。"""
+    queue = str(tmp_path / "queue")
+    _pair(tmp_path)
+    extra = write_queue_file(queue, "2026-09-25-extra.md", commit=False,
+                             fm_overrides={"status": "draft", "reply_to_file": A},
+                             body="## threads\n\n補足。\n")
+    assert _errors(extra) == []
+
+
+def test_理由の符丁はREASONSに閉じている():
+    for code in queuefile.REPLY_TO_FILE_MESSAGES:
+        assert code in lint_mod.REASONS