thth 3.1.0__tar.gz → 3.1.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: thth
-Version: 3.1.0
+Version: 3.1.2
 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`・`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`・`admin`。
+- **動くもの**（`thth --help` の全サブコマンド）: `lint`・`preview`・`approve`・`account`・`revoke`・`posts`・`replies`・`measured`・`threads`・`after`・`analytics-report`・`study-report`・`study`・`unanswered`・`handoff-report`・`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`。
 - **最初の本番投稿の記録**: 2026-09-09、@aoking に疎通確認を 1 本（`17916074118445631`）。
 - **未着手**: X・Facebook ページ・Instagram の各アダプタ。トピック検索の権限（tester には降りない）。泉のサーバ（v2-5）。
 - **権限の制約**: tester に降りる scope は 5 つ。削除はできない。

{thth-3.1.0 → thth-3.1.2}/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`・`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`・`admin`。
+- **動くもの**（`thth --help` の全サブコマンド）: `lint`・`preview`・`approve`・`account`・`revoke`・`posts`・`replies`・`measured`・`threads`・`after`・`analytics-report`・`study-report`・`study`・`unanswered`・`handoff-report`・`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`。
 - **最初の本番投稿の記録**: 2026-09-09、@aoking に疎通確認を 1 本（`17916074118445631`）。
 - **未着手**: X・Facebook ページ・Instagram の各アダプタ。トピック検索の権限（tester には降りない）。泉のサーバ（v2-5）。
 - **権限の制約**: tester に降りる scope は 5 つ。削除はできない。

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

@@ -534,6 +534,24 @@ ADMIN_TOOLS.append({'name':'thth_admin_watch_set','description':'Replace the wat
                    'words':{'type':'array','items':{'type':'string'}}},
                    'required':['account','words','by'],'additionalProperties':False}})
 
+# 報告の口の実装側（設計 3.1.2 §1）。返事と閉じるは `by` 必須・変更ログに
+# presence-only で残る。書き出し（export）は repo に書くので CLI だけ。
+ADMIN_TOOLS += [
+    {'name':'thth_admin_reports_list','description':'List bug reports and requests from every project (status open by default, or closed/all); administrator only; read-only',
+     'inputSchema':{'type':'object','properties':{'status':{'type':'string','enum':['open','closed','all']}},
+                    'required':[],'additionalProperties':False}},
+    {'name':'thth_admin_reports_show','description':'Read one report with its body, reproduction steps and replies; administrator only; read-only',
+     'inputSchema':{'type':'object','properties':{'report_id':{'type':'string'}},
+                    'required':['report_id'],'additionalProperties':False}},
+    {'name':'thth_admin_reports_reply','description':'Add a reply to one report (shown to the reporter in operations_handoff tool.reports); administrator only, by required; refused if the text looks like a secret',
+     'inputSchema':{'type':'object','properties':{'report_id':{'type':'string'},'text':{'type':'string'},'by':{'type':'string'}},
+                    'required':['report_id','text','by'],'additionalProperties':False}},
+    {'name':'thth_admin_reports_close','description':'Close one report with a reason (fixed, wontfix, duplicate, invalid) and the version that settled it; administrator only, by required',
+     'inputSchema':{'type':'object','properties':{'report_id':{'type':'string'},'by':{'type':'string'},
+                    'reason':{'type':'string','enum':['fixed','wontfix','duplicate','invalid']},'version':{'type':'string'}},
+                    'required':['report_id','reason','version','by'],'additionalProperties':False}},
+]
+
 SERVER_TOOLS = [
     {"name":"thth_"+name,"description":"Scoped server "+name,
      "inputSchema":{"type":"object","properties":{key:{"type":"string"} for key in ("account",*keys)},
@@ -566,6 +584,52 @@ del _tool
 
 
 
+# 報告の口の利用者側（設計 3.1.2 §1）。**サーバ型だけに出す**——手元の stdio
+# （pip 版）で置いても実装側には届かないので、届かない口は並べない。誰が置いたかは
+# credential の `actor` が決める（要求の欄からは作らない）。
+REPORT_TOOLS = [
+    {"name": "thth_report_file",
+     "description": "道具が断った・結果が期待と違った・欲しい形がある、のどれかならこれで置く"
+                    "（kind は bug か request。実装側が読み、返事は thth_report_show と "
+                    "operations_handoff の tool.reports に出る。秘密らしき値が含まれていたら置かない）",
+     "inputSchema": {"type": "object", "properties": {
+         "account": {"type": "string"},
+         "kind": {"type": "string", "enum": ["bug", "request"]},
+         "title": {"type": "string", "description": "1 行・120 字まで"},
+         "body": {"type": "string", "description": "8,000 字まで"},
+         "repro": {"type": "string", "description": "再現手順（任意・4,000 字まで）"}},
+         "required": ["account", "kind", "title", "body"], "additionalProperties": False}},
+    {"name": "thth_report_list",
+     "description": "自分の project の報告と、実装側の返事の数を読む（読むだけ）",
+     "inputSchema": {"type": "object", "properties": {
+         "status": {"type": "string", "enum": ["open", "closed", "all"]}},
+         "additionalProperties": False}},
+    {"name": "thth_report_show",
+     "description": "報告 1 件の本文と実装側の返事を読む（読むだけ）",
+     "inputSchema": {"type": "object", "properties": {"report_id": {"type": "string"}},
+                     "required": ["report_id"], "additionalProperties": False}},
+]
+
+
+# **うまくいかなければ報告の口へ**（設計 3.1.2 §3.5）。利用者の道具の説明文の
+# 末尾に 1 句。定数（TOOLS 等）は書き換えず、並べるときに足す——「売り文句」の
+# 正本（設計 v2 §1・「自分の泉」§2）はそのまま残る。
+REPORT_HINT = "（うまくいかなければ thth_report_file）"
+
+
+def _with_report_hint(tools):
+    return [tool if tool["name"].startswith("thth_report_")
+            else dict(tool, description=tool["description"] + REPORT_HINT) for tool in tools]
+
+
+def _channel_note():
+    """断りの応答に添える 2 つ目の text（静的な 1 行・本文も account 名も入れない）。"""
+    if APP_DIR not in sys.path:
+        sys.path.insert(0, APP_DIR)
+    from thth.report_inbox import CHANNEL_LINE
+    return {"type": "text", "text": CHANNEL_LINE}
+
+
 def server_mode():
     return 'THTH_REPORT_CREDENTIALS' in os.environ or 'THTH_REPORT_TOKEN' in os.environ
 
@@ -579,15 +643,16 @@ def server_tools(context):
     # account／project しか対象にできない（`report_service.execute_morning()`）。
     reports = reports + [tool for tool in TOOLS if tool['name']=='thth_morning']
     from thth.server_writes import WRITE_OPERATIONS
-    return reports + [tool for tool in SERVER_TOOLS
-                      if context.writes or tool['name'][5:] not in WRITE_OPERATIONS]
+    return _with_report_hint(reports + [tool for tool in SERVER_TOOLS
+                      if context.writes or tool['name'][5:] not in WRITE_OPERATIONS]) + REPORT_TOOLS
 
 
 def server_call(name, arguments):
     from thth.report_service import execute_report, execute_mcp_report, ReportServiceError
     from thth.server_writes import execute, WRITE_OPERATIONS, SAFE_ERRORS, DRAFT_REASONS
     context=authenticated_context()
-    failure=lambda value:{'content':[{'type':'text','text':value}],'isError':True}
+    # 断りは 1 つ目の text が静的な理由、2 つ目が受け口の案内（設計 3.1.2 §3.5）。
+    failure=lambda value:{'content':[{'type':'text','text':value},_channel_note()],'isError':True}
     if context is None: return failure('unauthorized')
     tool=next((tool for tool in server_tools(context) if tool['name']==name),None)
     if tool is None: return failure('unsupported_operation')
@@ -613,6 +678,12 @@ def server_call(name, arguments):
             result=execute_admin_write(context,request)
         elif operation in WRITE_OPERATIONS:
             result=execute(context,request,via='mcp')
+        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'):
+            from thth.report_service import execute_user_reports
+            result=execute_user_reports(context,request)
         elif operation=='morning':
             from thth.report_service import execute_morning
             result=execute_morning(context,request)
@@ -626,7 +697,11 @@ def server_call(name, arguments):
             # 理由は静的な符丁の表にあるものだけ。lint の自由文は通さない。
             detail=getattr(exc,'reason',None)
             return failure('invalid_draft: '+(detail if detail in DRAFT_REASONS else 'validation_failed'))
-        return failure(str(exc) if str(exc) in SAFE_ERRORS or str(exc) in ('budget_change_durability_unconfirmed','budget_change_partially_recorded','budget_change_refused','watch_change_refused') else 'request_unavailable')
+        from thth.report_inbox import REASONS as REPORT_REASONS
+        if str(exc)=='duplicate_report' and getattr(exc,'report_id',None):
+            # 既存の id は同じ account の報告だけ（重複の検査がそう絞っている）。
+            return failure('duplicate_report: '+exc.report_id)
+        return failure(str(exc) if str(exc) in SAFE_ERRORS or str(exc) in REPORT_REASONS or str(exc) in ('budget_change_durability_unconfirmed','budget_change_partially_recorded','budget_change_refused','watch_change_refused') else 'request_unavailable')
     except Exception:
         return failure('request_unavailable')
 
@@ -670,7 +745,7 @@ def call_tool(name: str, arguments: dict | None) -> dict:
     if isinstance(name, str) and name.startswith("thth_admin_"):
         context = admin_context()
         if context is None:
-            return {"content": [{"type": "text", "text": "unauthorized"}], "isError": True}
+            return {"content": [{"type": "text", "text": "unauthorized"}, _channel_note()], "isError": True}
         from thth.report_service import execute_report, ReportServiceError
         try:
             if "operation" in arguments: raise ReportServiceError("invalid_request")
@@ -679,7 +754,7 @@ def call_tool(name: str, arguments: dict | None) -> dict:
             return {"content": [{"type": "text", "text": json.dumps(result, ensure_ascii=False)}]}
         except (ValueError, TypeError, ReportServiceError) as error:
             reason = "invalid_options" if str(error) == "invalid_options" else "invalid_request"
-            return {"content": [{"type": "text", "text": reason}], "isError": True}
+            return {"content": [{"type": "text", "text": reason}, _channel_note()], "isError": True}
     if name == "thth_lint":
         proc = run_cli(["lint", arguments["file"], "--json"])
         text = proc.stdout
@@ -838,7 +913,7 @@ def call_tool(name: str, arguments: dict | None) -> dict:
         proc = run_cli(args)
         text = proc.stdout
     else:
-        return {"content": [{"type": "text", "text": f"unknown tool: {name}"}], "isError": True}
+        return {"content": [{"type": "text", "text": f"unknown tool: {name}"}, _channel_note()], "isError": True}
 
     if name.startswith("thth_topic_") or name in (
             "before_you_post", "after_you_posted", "analytics_report", "operations_handoff", "study_report", "thread_read", "where_to_appear",
@@ -854,7 +929,11 @@ def call_tool(name: str, arguments: dict | None) -> dict:
         is_error = proc.returncode not in (0, 1)  # lint は 1 も正常な「検査結果」
     if not text:
         text = proc.stderr
-    return {"content": [{"type": "text", "text": text}], "isError": is_error}
+    content = [{"type": "text", "text": text}]
+    # 断りなら受け口の案内を 2 つ目に（CLI の理由行に既に載っていれば重ねない）。
+    if is_error and _channel_note()["text"] not in text:
+        content.append(_channel_note())
+    return {"content": content, "isError": is_error}
 
 
 def _send(obj: dict) -> None:

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

@@ -5,6 +5,8 @@ description: 投稿する前・返信を書く前・出したあと・絡みに
 
 **開始時は、まず `thth_morning`（CLI は `thth morning <project|account> --json`）を 1 回。** 昨日から何があって今日なにをすればよいかが 6 段（道具・返していないもの・昨日の自分・世間・予定・次の一手）で返る。`handoff-report --since-last-read` を包含するので、版の確認もこれ 1 回で済む。呼ぶと栞（前回読んだ時点）が進む——進めたくないときだけ `mark: false`（CLI は `--no-mark`）。取れなかった段は `{"value": null, "cannot_say": "<理由>"}`（`provider_timeout`・`budget_exhausted`・`scope_missing`・`no_watch_words`・`not_supported`・`unavailable`）で、**0 件とは別**。第 3 段の監視語は**管理者が入れる**（`thth admin watch set <account> 語 … --by <名前>`）——語が無い account は `no_watch_words` で飛ぶので、**代わりに語を選ばない**。第 5 段は候補の列挙だけで、**本文は返らない**（書くのはあなたと人の会話の側）。詳しくは `docs/使い方_毎朝の一枚_3.1.md`。
 
+**断られたら・違和感があれば報告の口へ**: `thth_report_file`（CLI は `thth report file <account> --kind bug|request --title … --body-file … --by <名前>`）。道具が断った・結果が期待と違った・欲しい形がある、のどれかなら 1 回で置ける。返事は `thth_report_show` と `handoff-report --since-last-read` の `tool.reports` に出る。秘密らしき値が含まれていたら置かれない（伏せてから置き直す）。
+
 段だけを読み直したいときは `thth handoff-report <account> --since-last-read --json` を読む。`tool.changed_since_last_read` が真なら、手元の `tool.notes_root_local_hint` を手掛かりに `tool.release_notes` の相対名を読んでから作業する。既読の記録は `--mark-read --by <名前>` の明示時だけ。`tool.notes_reason` が `notes_directory_unavailable` なら、このインストールには読める docs がない。空の `release_notes` を「変更なし」と解釈しない。
 
 添付を付ける前に `tool.capabilities` を読む（媒体ごとの「出せるもの」表。`thth doctor` にも同じ表が出る。`unverified` は「非対応」ではない）。
@@ -141,6 +143,7 @@ MCP `after_you_posted`。**24h の刻みが無ければ `null`**（0 と混ぜ
 
 - `thth --help` / `thth <subcommand> --help` が正本。
 - `thth doctor <account>` が「いま投稿できる状態か」を最初から最後まで言う。
+- 道具の不具合・欲しい形は `thth report file`（MCP `thth_report_file`）で実装側に届ける。
 - 使い方の全文: `docs/使い方_プロジェクトのセッション向け_2026-09-09.md`。
 
 ## 運用と分析のレポート（v3系・2.5.0 から）

{thth-3.1.0 → thth-3.1.2}/skills/thth-admin/SKILL.md

@@ -3,7 +3,7 @@ name: thth-admin
 description: Read authenticated THTH administrator inventory, changes and token status; hand findings to a person.
 ---
 
-開始時は `thth admin diff --since-last-read --json` を読み、変化があった account を `thth admin account <name> --json` で確認する。週1回 `thth admin tokens --json` を確認する。
+開始時は `thth admin diff --since-last-read --json` を読み、変化があった account を `thth admin account <name> --json` で確認する。利用者からの不具合と要望は `thth admin reports list --json`（MCP `thth_admin_reports_list`・既定は開いているものだけ）で読み、`show <id>` で全文を見る。返事は `thth admin reports reply <id> --by <名前> --text-file <file>`、閉じるときは `close <id> --by <名前> --reason fixed|wontfix|duplicate|invalid --version <版>`。返事と閉じるは人（masaru）の判断を経てから打つ。写しを残すときは `thth admin reports export --to <私有の dir> --by <名前>`。**私有の置き場へ。公開 repo には置かない**（本文は利用者が書いた文。既定の行き先は無い）。週1回 `thth admin tokens --json` を確認する。
 
 読んだ結果から承認・投稿・設定変更をしない。必要な対処は根拠・欠測理由・観測時刻とともに人に渡す。記録が無い null は正常・停止・期限なしの証拠ではない。API probe は人が明示的に必要とした場合の CLI `--probe` のみ。
 

{thth-3.1.0 → thth-3.1.2}/tests/test_admin_http_mcp.py

@@ -39,7 +39,9 @@ def test_admin_all_registry_and_mcp_auth_rechecked(credentials,monkeypatch):
     assert server.admin_context().scope=='admin'
     assert {tool['name'] for tool in server.ADMIN_TOOLS}=={
         'thth_admin_inventory','thth_admin_account','thth_admin_diff','thth_admin_log',
-        'thth_admin_tokens','thth_admin_release','thth_admin_budget_set','thth_admin_watch_set'}
+        'thth_admin_tokens','thth_admin_release','thth_admin_budget_set','thth_admin_watch_set',
+        # 報告の口の実装側（設計 3.1.2 §1）。
+        'thth_admin_reports_list','thth_admin_reports_show','thth_admin_reports_reply','thth_admin_reports_close'}
     result=server.call_tool('thth_admin_inventory',{})
     assert set(json.loads(result['content'][0]['text'])['by_account'])=={'first','second'}
     assert server.call_tool('thth_admin_diff',{'mark_read':True})['isError']

{thth-3.1.0 → thth-3.1.2}/tests/test_ask.py

@@ -780,7 +780,11 @@ def test_本物の台帳でrc0でcannot_sayが出る(tmp_path):
     answer = json.loads(proc.stdout)
     assert answer["provenance"]["source"] == "local"
     assert answer["cannot_say"], "手元の水で言い切ってしまっている"
-    assert answer["expected"]["branches_24h"]["median"] is None
+    # 本物の水は日々増えるので、中央値の有無そのものは固定できない（2026-09-23:
+    # kopicha の 24h の観測が n=24 になり、中央値 0 が正直な答えになった）。見るのは
+    # 規約 2「n が min_n に満たなければ中央値を言わない」が本物の水でも守られること。
+    branches = answer["expected"]["branches_24h"]
+    assert (branches["median"] is None) == (branches["n"] < ask_mod.DEFAULT_MIN_N)
 
 
 def test_P3_6_THTH_NOWで時刻を固定できる(account, thth_root):

{thth-3.1.0 → thth-3.1.2}/tests/test_replies.py

@@ -24,6 +24,14 @@ def _replies_path(account, post_id: str = "POST1") -> str:
     return os.path.join(account["repo_dir"], "data", "sns", "replies", f"{post_id}.ndjson")
 
 
+def _own_post(account, post_id: str = "POST1") -> None:
+    """その account が出した記録（`sent/`）を置く。`thth replies` は置き場を共有する
+    他 account の返信を返さないので（3.1.1）、CLI の試験は所有の記録を先に置く。"""
+    from thth import accounts, approval, sent
+    sent.write(accounts.state_dir_for(account["name"]), post_id=post_id, text="本文",
+               body_hash=approval.compute_body_hash("本文"), sent_at="2026-09-10T09:00:00+09:00")
+
+
 def test_返信を読めること(isolated_account):
     """`kind: reply` の行だけが `replies` に入り、`kind: fetch` の行は `fetches` に入る。"""
     _write_ndjson(_replies_path(isolated_account), [
@@ -129,14 +137,16 @@ def test_CLIがjsonでloadと同じものを返す(isolated_account, capsys):
          "post_id": "POST1", "collected_at": "2026-09-10T19:00:00+09:00"},
     ])
 
+    _own_post(isolated_account)
+
     args = argparse.Namespace(account=isolated_account["name"], post=None, json=True)
     rc = cli_mod.cmd_replies(args)
     captured = capsys.readouterr()
 
     assert rc == 0
     printed = json.loads(captured.out)
-    expected = replies_mod.load(isolated_account["name"])
-    assert printed == expected
+    expected = replies_mod.load(isolated_account["name"], owned_only=True)
+    assert printed == expected and [r["id"] for r in printed["replies"]] == ["R1"]
 
 
 def test_CLIの人向け出力は身内に印をつける(isolated_account_factory, capsys):
@@ -149,6 +159,7 @@ def test_CLIの人向け出力は身内に印をつける(isolated_account_facto
         {"kind": "reply", "id": "R2", "text": "よその返信", "username": "だれか",
          "post_id": "POST1", "collected_at": "2026-09-10T19:00:00+09:00"},
     ])
+    _own_post(account)
 
     args = argparse.Namespace(account=account["name"], post=None, json=False)
     rc = cli_mod.cmd_replies(args)

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

@@ -25,7 +25,10 @@ def json_parsers():
 # must acquire a table row, rather than quietly escaping the contract.
 COMMANDS = '''lint|preview|approve|account|revoke|posts|replies|measured|threads|study-report|analytics-report|after|topics|forms|queue|schedule|throw|handoff-report|board|pull|maintain|doctor|app show|admin inventory|admin account|admin log|admin tokens|admin timers|admin release|admin diff|ask before-you-post|mentions|profile|thread|where|who|retract|location|topics suggest|topics observe|topics record-decision|topics decision|topics observation|topics retract|topics unretract|topics profile|topics adopt-reason|topics adoptions|topics record-vocabulary|topics vocabulary|topics record-review|topics review|topics record-form-spec|topics form-spec|topics form-check|topics improvements|topics impact|topics record-hypothesis|topics hypotheses'''.split('|') + ['account add', 'account migrate', 'unanswered', 'study add', 'admin deletion sync', 'admin budget', 'admin media cleanup-retry', 'admin media gc',
      # 3.1.0: 毎朝の一枚と監視語（設計 3.1.0 §1・§3）。
-     'morning', 'admin watch set', 'admin watch show']
+     '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',
+     'admin reports reply', 'admin reports close', 'admin reports export']
 
 
 def test_json_table_covers_every_parser():

{thth-3.1.0 → thth-3.1.2}/tests/test_v212_leave.py

@@ -149,7 +149,8 @@ def test_shared_manual_grant_does_not_tell_person_to_revoke_other_account(env,wo
     a=env['root']/'secrets/alpha.json';b=env['root']/'secrets/beta.json';b.write_bytes(a.read_bytes())
     assert leave.command(SimpleNamespace(name='alpha',by='operator',json=False))==0
     result=leave.read('alpha')
-    assert result['remote']=='unconfirmed_shared' and a.exists() and b.exists()
+    # 3.1.2 件 6・裁定 09-23: 値だけの共有（別ファイル）なら自分の file は消し、相手の file は残す。
+    assert result['remote']=='unconfirmed_shared' and not a.exists() and b.exists()
     out=capsys.readouterr().out
     assert '切り分け' in out and '本人が解除' not in out
 

{thth-3.1.0 → thth-3.1.2}/tests/test_v212_leave_providers.py

@@ -84,8 +84,11 @@ def test_shared_mastodon_grant_refuses_remote_revoke_but_shared_client_alone_doe
     cfg,tokenpath=configure(env,provider,monkeypatch,'mastodon');old=tokenpath.read_bytes()
     other=env['root']/'accounts/beta.json';b=json.loads(other.read_text());b.update(media='mastodon',instance=provider['base']);other.write_text(json.dumps(b))
     (env['root']/'secrets/beta.json').write_bytes(old)
-    with pytest.raises(ValueError,match='shared_credential'):leave.run('alpha',by='operator')
-    assert provider['calls']==[] and tokenpath.read_bytes()==old
+    # 3.1.2 件 6: 共有の接続は遠隔で失効させず（calls==[]）、止まらずに退出を終える。
+    # 裁定 09-23: 値だけの共有（別ファイル）なら自分の token file は消す。相手の file は残る。
+    result=leave.run('alpha',by='operator')
+    assert result['phase']=='completed' and result['remote']=='unconfirmed_shared' and 'token_shared' not in result['preserved']
+    assert provider['calls']==[] and not tokenpath.exists() and (env['root']/'secrets/beta.json').read_bytes()==old
 
 
 def test_b_credential_commit_before_revoke_is_rechecked_after_inventory(env,provider,monkeypatch):
@@ -99,8 +102,11 @@ def test_b_credential_commit_before_revoke_is_rechecked_after_inventory(env,prov
         authflow.commit_manual('beta',cfg_b,token_a,snapshot=snapshot,session=None,by='operator')
         return {'status':'revoked'}
     monkeypatch.setattr(approval_relay,'signed_request',worker)
-    with pytest.raises(ValueError,match='shared_credential'):leave.run('alpha',by='operator')
-    assert provider['calls']==[] and tokenpath.exists()
+    # 3.1.2 件 6: 共有の接続は遠隔で失効させず（calls==[]）、止まらずに退出を終える。
+    # 裁定 09-23: 値だけの共有（別ファイル）なら自分の token file は消す。相手の file は残る。
+    result=leave.run('alpha',by='operator')
+    assert result['phase']=='completed' and result['remote']=='unconfirmed_shared' and 'token_shared' not in result['preserved']
+    assert provider['calls']==[] and not tokenpath.exists()
     assert json.loads((env['root']/'secrets/beta.json').read_text())==token_a
 
 
@@ -166,5 +172,7 @@ def test_b_exchange_to_commit_holds_registry_lease_and_late_shared_grant_vetoes_
     assert a.is_alive() and provider['calls']==[]
     release.set();a.join(4);b.join(4)
     assert not a.is_alive() and not b.is_alive() and results==[0]
-    assert leave_errors==['shared_credential_revoke_refused'] and provider['calls']==[]
+    # 3.1.2 件 6: 共有の接続は遠隔で失効させず（calls==[]）、止まらずに退出を終える。
+    assert leave_errors==[] and provider['calls']==[]
+    assert leave.read('alpha')['phase']=='completed' and leave.read('alpha')['remote']=='unconfirmed_shared'
     assert accounts.load_token(accounts.load_account('beta'))['access_token']==value['access_token']

{thth-3.1.0 → thth-3.1.2}/tests/test_v212_read_coordination.py

@@ -61,7 +61,7 @@ def test_cli_reads_do_not_wait_or_call_core_when_leave_holds_exclusive(env,conte
         start=time.monotonic();rc=cli.main(command);elapsed=time.monotonic()-start
     captured=capsys.readouterr();assert rc==2 and elapsed<1
     assert json.loads(captured.out)=={'error':'account_leaving','cannot_say':['account_leaving']}
-    assert captured.err.strip()=='account_leaving'
+    assert captured.err.strip()=='account_leaving\n'+__import__('thth.report_inbox').report_inbox.CHANNEL_LINE  # 3.1.2 §3.5: 断りの理由行の後ろに受け口の案内 1 行
 
 
 def test_dry_send_input_then_nonwaiting_lease(env,tmp_path,capsys):
@@ -69,7 +69,7 @@ def test_dry_send_input_then_nonwaiting_lease(env,tmp_path,capsys):
     with exclusive():
         start=time.monotonic();rc=cli.main(['send','alpha','--text-file',str(text)])
         assert time.monotonic()-start<1 and rc==2
-    assert capsys.readouterr().err.strip()=='account_leaving'
+    assert capsys.readouterr().err.strip()=='account_leaving\n'+__import__('thth.report_inbox').report_inbox.CHANNEL_LINE  # 3.1.2 §3.5: 断りの理由行の後ろに受け口の案内 1 行
     assert not (env['root']/'state/alpha/sent').exists()
 
 
@@ -145,7 +145,7 @@ def test_real_cli_child_rejects_ex_under_deadline(env,content):
             result=subprocess.run([sys.executable,'-c',"from thth.cli import main;raise SystemExit(main(['queue','alpha','--json']))"],capture_output=True,text=True,timeout=2)
         except subprocess.TimeoutExpired:pytest.fail('reader waited for the exit drain')
     assert result.returncode==2 and json.loads(result.stdout)['cannot_say']==['account_leaving']
-    assert result.stderr.strip()=='account_leaving'
+    assert result.stderr.strip()=='account_leaving\n'+__import__('thth.report_inbox').report_inbox.CHANNEL_LINE  # 3.1.2 §3.5: 断りの理由行の後ろに受け口の案内 1 行
 
 
 def test_report_holds_lease_through_calculation_and_release(env,monkeypatch):

{thth-3.1.0 → thth-3.1.2}/tests/test_v213_carryover_timeout.py

@@ -51,7 +51,7 @@ raise SystemExit(cli.main(json.loads(sys.argv[1])))
         # cannot trap this pytest process before an elapsed-time assertion.
         result = subprocess.run([sys.executable, '-c', code, json.dumps(command), str(marker)],
                                 capture_output=True, text=True, timeout=3)
-    assert result.returncode == 2 and result.stderr.strip() == 'account_leaving'
+    assert result.returncode == 2 and result.stderr.strip() == 'account_leaving\n' + __import__('thth.report_inbox').report_inbox.CHANNEL_LINE  # 3.1.2 §3.5: 断りの理由行の後ろに受け口の案内 1 行
     if operation == 'replies':
         assert json.loads(result.stdout) == {'error': 'account_leaving', 'cannot_say': ['account_leaving']}
     assert not marker.exists()

{thth-3.1.0 → thth-3.1.2}/tests/test_v213_review_followups.py

@@ -14,7 +14,7 @@ def test_run_invalid_name_before_any_storage_or_effect(monkeypatch,capsys,name):
     monkeypatch.setattr('thth.incident.notify',forbidden)
     assert cli.main(['run',name])==2
     captured=capsys.readouterr();value=json.loads(captured.out)
-    assert captured.err.strip()=='invalid_account_name'
+    assert captured.err.strip()=='invalid_account_name\n'+__import__('thth.report_inbox').report_inbox.CHANNEL_LINE  # 3.1.2 §3.5: 断りの理由行の後ろに受け口の案内 1 行
     assert value['error']==value['record_unavailable']=='invalid_account_name'
     assert value['account'] is None and value['runs_recorded'] is False
     assert '使えない字' in value['message'] and 'account_stopped' not in captured.out

{thth-3.1.0 → thth-3.1.2}/tests/test_v213_stop_observation.py

@@ -30,7 +30,7 @@ def test_run_reason_and_no_side_effect(env,monkeypatch,capsys,state,expected):
     monkeypatch.setattr('thth.healthcheck.notify',lambda *a,**kw:pytest.fail('healthcheck notification'))
     monkeypatch.setattr('thth.incident.notify',lambda *a,**kw:pytest.fail('incident notification'))
     assert cli.main(['run','alpha'])==2
-    shown=capsys.readouterr();assert shown.err.strip()==expected
+    shown=capsys.readouterr();assert shown.err.strip()==expected+'\n'+__import__('thth.report_inbox').report_inbox.CHANNEL_LINE  # 3.1.2 §3.5: 断りの理由行の後ろに受け口の案内 1 行
     value=json.loads(shown.out)
     assert value=={'account':'alpha','mode':'production','action':'skip','status':'error','error':expected,
                    'runs_recorded':False,'record_unavailable':expected}

{thth-3.1.0 → thth-3.1.2}/tests/test_v21b_approved_writes.py

@@ -645,6 +645,9 @@ def test_DELETEが飛ぶ経路はretract_cliのdelete_postだけ():
     src = inspect.getsource(retract_cli)
     assert src.count(".delete_post(") == 1          # 呼び出しは 1 か所（docstring の言及は除く）
     assert inspect.getsource(threads_mod).count('method="DELETE"') == 1
+    # Mastodon の DELETE（3.1.1）も `delete_post` の中の 1 か所だけ。
+    assert inspect.getsource(mastodon).count('"DELETE"') == 1
+    assert '"DELETE"' in inspect.getsource(mastodon.MastodonAdapter.delete_post)
 
 
 def test_Threadsのdelete_postは数字以外のidを断る():

thth-3.1.2/tests/test_v311_leave_same_user.py

@@ -0,0 +1,68 @@
+"""3.1.1 件 1: 退出の「共有」判定は token の中身（値・ファイル）に限る。
+
+同じ instance の同じ利用者（user_id 同一）の別台帳は、Mastodon／X では共有と見ない。
+失効は渡した token の値だけに効くので、相手の token file・台帳・停止状態に触らずに
+退出が completed まで通ることを、loopback の fake 媒体で固定する。
+"""
+import json
+import pytest
+from thth import accounts,leave,leave_gate,approval_relay
+from tests.test_v212_server_writes import env
+from tests.test_v212_leave_providers import provider,configure
+
+
+def same_user_beta(env,provider,tokenpath,media,*,same_bytes=False):
+    """beta を alpha と同じ媒体・同じ instance・同じ user_id にする。token の値は既定で別。"""
+    user='synthetic-user-'+media
+    a=json.loads(tokenpath.read_text());a['user_id']=user;tokenpath.write_text(json.dumps(a))
+    path=env['root']/'accounts/beta.json';b=json.loads(path.read_text());b['media']=media
+    if media=='mastodon':b['instance']=provider['base']
+    path.write_text(json.dumps(b))
+    beta_token=env['root']/'secrets/beta.json'
+    if same_bytes:beta_token.write_bytes(tokenpath.read_bytes())
+    else:
+        t=json.loads(beta_token.read_text());t['user_id']=user;beta_token.write_text(json.dumps(t))
+        assert t['access_token']!=a['access_token']
+    return beta_token,path
+
+
+@pytest.mark.parametrize('media',['mastodon','x'])
+def test_same_user_different_token_leave_completes_and_leaves_other_account_untouched(env,provider,monkeypatch,media):
+    _,tokenpath=configure(env,provider,monkeypatch,media)
+    beta_token,beta_ledger=same_user_beta(env,provider,tokenpath,media)
+    other_token=beta_token.read_bytes();other_ledger=beta_ledger.read_bytes()
+    other_access=json.loads(other_token)['access_token']
+    result=leave.run('alpha',by='operator')
+    assert result['phase']=='completed' and result['remote']=='confirmed'
+    assert 'token_shared' not in result['preserved'] and not tokenpath.exists()
+    # 媒体の失効に来たのは自分の token の値だけ。相手の値は 1 度も送られていない。
+    sent=[form['token'][0] for _,form,_ in provider['calls']]
+    assert provider['access'] in sent and other_access not in sent
+    assert set(sent)<={provider['access'],provider['refresh']}
+    # 相手の token file と台帳は byte 一致で残り、停止もしていない。
+    assert beta_token.read_bytes()==other_token and beta_ledger.read_bytes()==other_ledger
+    assert not leave_gate.stopped('beta') and leave.read('beta') is None
+    assert accounts.load_token(accounts.load_account('beta'))['access_token']==other_access
+
+
+def test_same_token_bytes_do_not_revoke_remotely(env,provider,monkeypatch):
+    _,tokenpath=configure(env,provider,monkeypatch,'mastodon')
+    beta_token,_=same_user_beta(env,provider,tokenpath,'mastodon',same_bytes=True)
+    old=tokenpath.read_bytes()
+    # 3.1.2 件 6: 失効は投げない（他方も死ぬ）。止まらずに completed まで進む
+    # （完了までの形は tests/test_v312_leave_shared_token.py）。
+    result=leave.run('alpha',by='operator')
+    assert result['phase']=='completed' and result['remote']=='unconfirmed_shared'
+    # 裁定 09-23: 値だけの共有（別ファイル）なら自分の token file は消す。相手の file は残る。
+    assert provider['calls']==[] and not tokenpath.exists() and beta_token.read_bytes()==old
+
+
+def test_threads_same_user_is_still_token_shared_and_preserved(env,monkeypatch):
+    monkeypatch.setattr(approval_relay,'signed_request',lambda *a:{'status':'revoked'})
+    paths=[env['root']/'secrets'/(n+'.json') for n in ('alpha','beta')]
+    for p in paths:
+        t=json.loads(p.read_text());t['user_id']='synthetic-threads-user';p.write_text(json.dumps(t))
+    old=[p.read_bytes() for p in paths]
+    result=leave.run('alpha',by='operator')
+    assert result['phase']=='completed' and result['preserved']==['token_shared'] and result['remote']=='unconfirmed_shared'
+    assert [p.read_bytes() for p in paths]==old and not leave_gate.stopped('beta')