thth 3.8.0__tar.gz → 3.8.2__tar.gz

{thth-3.8.0 → thth-3.8.2}/PKG-INFO

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

{thth-3.8.0 → thth-3.8.2}/mcp/server.py

@@ -717,7 +717,9 @@ PLAZA_TOOLS = [
                     "how〔数字を出し直せる thth の命令〕が必須）・気づき（finding）・問い（question）を"
                     "置く。scope（媒体・企画の範囲）は必須。置いたものは同じ持ち主の全 account だけに"
                     "見える（visibility: owner は管理者が登録した持ち主の組の全 project に一段で見せる。"
-                    "他の持ち主に見せる open は人が CLI の二段確認で行う・この口には無い）。"
+                    "project が組に入っていれば visibility 省略の既定は owner・入っていなければ"
+                    "従前どおり project（設計 3.8.1）。他の持ち主に見せる open は人が CLI の二段確認"
+                    "で行う・この口には無い）。"
                     "evidence_level の observed は道具だけが付ける。from_tool（analytics-report・after・"
                     "study-report）・from_doc・from_report で、道具がその出力を置く時点で作り直して"
                     "数字を観測の欄と本文の下書きに入れる（body は任意の解釈）",
@@ -738,7 +740,8 @@ PLAZA_TOOLS = [
          "goal": {"type": "string", "enum": ["reach", "click", "follow", "reply"],
                   "description": "施策の目的（任意）。媒体をまたいで同じ目的の施策を比べる札"},
          "visibility": {"type": "string", "enum": ["project", "owner"],
-                        "description": "project（既定）か owner（持ち主の組・管理者が組を登録したときだけ）"},
+                        "description": "project か owner（持ち主の組・管理者が組を登録したときだけ）。"
+                                       "省略時は project が組に入っていれば owner・入っていなければ project"},
          "trial_due": {"type": "string", "description": "finding の追試の予定日（2026-10-08 か timezone 付きの時刻）"},
          "from_tool": {"type": "string", "enum": ["analytics-report", "after", "study-report"],
                        "description": "道具の出力から置く（analytics-report・after は from_account・"

{thth-3.8.0 → thth-3.8.2}/tests/test_v380_plaza_moments.py

@@ -211,10 +211,14 @@ def test_listが自分の書き込みだけなら管理者に頼む命令の形
     post(account="kopicha-bsky", title="自分の持ち主の")
     payload = plaza.list_posts(viewer("kopicha-threads"))
     assert payload["hint"]["reason"] == "only_own_posts"
-    # 組と参加がそろえば、頼むことが無いので何も言わない。
+    # 組と参加がそろっても、組の他の project がまだ owner 範囲に何も置いていなければ、
+    # 頼むことは無いのでその旨だけ言う（「組の登録を頼んで」ではない・設計 3.8.1）。
     plaza.set_owner("masaru", ["kopicha", "other"], by="operator")
     plaza.set_membership("kopicha", joined=True, by="operator")
-    assert plaza.list_posts(viewer("kopicha-threads"))["hint"] is None
+    hint = plaza.list_posts(viewer("kopicha-threads"))["hint"]
+    assert hint == {"reason": "only_own_posts", "commands": [],
+                    "line": "広場: 組（masaru）の他の project の書き込みは owner 範囲にした"
+                            "ものだけ見えます。まだ 0 件です"}
     # 組の相手の書き込みが読めるなら案内は出さない。
     plaza.set_membership("kopicha", joined=False, by="operator")
     post(account="other-threads", title="組", by="o", visibility="owner")

{thth-3.8.0 → thth-3.8.2}/tests/test_v380_plaza_owner.py

@@ -63,8 +63,9 @@ def test_組に登録したprojectだけにownerの書き込みが見える(grou
     assert plaza.list_posts(viewer("third-threads"))["n"] == 0
     third_text = json.dumps(plaza.list_posts(viewer("third-threads")), ensure_ascii=False)
     assert "OWNER-TITLE" not in third_text
-    # project の範囲の書き込みは組の相手にも見せない（従前どおり）。
-    inside = post(title="PROJECT-ONLY-2")
+    # project の範囲の書き込みは組の相手にも見せない（従前どおり）。組があるので既定は
+    # owner に変わった（設計 3.8.1）ため、ここは project を明示して確かめる。
+    inside = post(title="PROJECT-ONLY-2", visibility="project")
     with pytest.raises(plaza.PlazaError, match="^plaza_not_found$"):
         plaza.show(inside["plaza_id"], viewer("other-threads"))
 
@@ -181,7 +182,8 @@ def test_observeの0段に組の新着(grouped, monkeypatch):
     now = jst.now_jst()
     plaza.set_owner("masaru", ["kopicha", "other"], by="operator")
     post(title="組の気づき", visibility="owner", now=now - datetime.timedelta(hours=1))
-    post(title="PROJECT-INSIDE", now=now - datetime.timedelta(hours=1))
+    # 組があるので既定は owner に変わった（設計 3.8.1）ため、project 側の 1 件は明示する。
+    post(title="PROJECT-INSIDE", visibility="project", now=now - datetime.timedelta(hours=1))
     cell = next(s for s in morning.build("other-threads", now=now, mark=False)["sections"]
                 if s["section"] == "tool")["value"]["plaza"]
     assert cell["owner_new"] == 1 and cell["owner_denominator"] == 1

thth-3.8.2/tests/test_v381_plaza_visibility_default.py

@@ -0,0 +1,100 @@
+"""3.8.1 visibility の既定は project の持ち主の組次第（設計 3.8.1）。
+
+見るのは:
+  - project が持ち主の組に入っていれば、CLI の `plaza post`（--open・--owner 無し）と
+    MCP の `thth_plaza_post`（visibility 省略）の既定は owner に変わる。
+  - 組に入っていない project は従前どおり既定が project（回帰固定）。
+  - open は明示（`--open`／二段確認）が無ければ決して既定にならない（回帰固定・
+    組があっても・open に参加していても）。
+  - 明示の `--owner`／MCP の `visibility` があれば、組があってもそれに従う。
+  - 既定で owner にしたときだけ応答に「範囲: owner（組 <名前> の既定）」と `visibility_default`。
+"""
+from __future__ import annotations
+
+import json
+
+from thth import cli, plaza
+from tests.test_v340_plaza_store import owners  # noqa: F401  (fixture)
+from tests.test_v340_plaza_mcp import _post, _tenant, _text
+from tests.test_v380_plaza_owner import grouped  # noqa: F401  (fixture)
+
+
+def _body(tmp_path, text="本文です。朝の投稿で試した", name="body.txt"):
+    path = tmp_path / name
+    path.write_text(text, encoding="utf-8")
+    return str(path)
+
+
+def _cli_post(tmp_path, capsys, account, title, *, extra=()):
+    rc = cli.main(["plaza", "post", account, "--kind", "finding", "--title", title,
+                   "--body-file", _body(tmp_path, name=title + ".txt"),
+                   "--scope", "Threads の朝の投稿", "--by", "k", *extra, "--json"])
+    out = capsys.readouterr().out
+    return rc, (json.loads(out) if out.strip() else None)
+
+
+def test_CLI_組が無いうちは既定がproject_組に入れば既定がowner(grouped, capsys, tmp_path):
+    # 組が無い間は従前どおり既定が project（回帰固定）。
+    rc, posted = _cli_post(tmp_path, capsys, "kopicha-threads", "組なし")
+    assert rc == 0 and posted["scope"] == "project" and posted["visibility_default"] is None
+
+    plaza.set_owner("masaru", ["kopicha", "other"], by="operator")
+    rc, posted = _cli_post(tmp_path, capsys, "kopicha-threads", "組あり")
+    assert rc == 0 and posted["scope"] == "owner" and posted["visibility_default"] == "masaru"
+
+    # 組に入っていない project（third）は既定が project のまま（回帰固定）。
+    rc, posted = _cli_post(tmp_path, capsys, "third-threads", "組の外")
+    assert rc == 0 and posted["scope"] == "project" and posted["visibility_default"] is None
+
+    # 明示の --owner があれば、組が無くても（既に組があっても）それに従う。
+    rc, posted = _cli_post(tmp_path, capsys, "kopicha-threads", "明示のowner",
+                           extra=("--owner",))
+    assert rc == 0 and posted["scope"] == "owner" and posted["visibility_default"] is None
+
+
+def test_CLIの人向け応答に範囲の既定を明記する(grouped, capsys, tmp_path):
+    plaza.set_owner("masaru", ["kopicha", "other"], by="operator")
+    rc = cli.main(["plaza", "post", "kopicha-threads", "--kind", "finding", "--title", "人向け",
+                   "--body-file", _body(tmp_path), "--scope", "Threads の朝の投稿", "--by", "k"])
+    out = capsys.readouterr().out
+    assert rc == 0 and "範囲: owner（組 masaru の既定）" in out
+    # 明示の --owner のときは既定の案内を出さない（すでに自分で選んでいる）。
+    rc = cli.main(["plaza", "post", "kopicha-threads", "--kind", "finding", "--title", "明示",
+                   "--body-file", _body(tmp_path, name="明示.txt"), "--scope", "Threads の朝の投稿",
+                   "--by", "k", "--owner"])
+    out = capsys.readouterr().out
+    assert rc == 0 and "範囲: owner（組" not in out
+
+
+def test_openは組があっても参加していても既定にならない(grouped, capsys, tmp_path):
+    plaza.set_owner("masaru", ["kopicha", "other"], by="operator")
+    plaza.set_membership("kopicha", joined=True, by="operator")
+    rc, posted = _cli_post(tmp_path, capsys, "kopicha-threads", "参加中でも既定はowner")
+    assert rc == 0 and posted["scope"] == "owner"
+    # --open は今までどおり明示 + 二段確認が要る（既定にはならない）。
+    rc = cli.main(["plaza", "post", "kopicha-threads", "--kind", "finding", "--title", "openは明示",
+                   "--body-file", _body(tmp_path, name="open.txt"), "--scope", "Threads の朝の投稿",
+                   "--by", "k", "--open", "--json"])
+    out = json.loads(capsys.readouterr().out)
+    # 一段目は何も書かずに終わる（approve の一段目と同じ rc 1・`_emit_preview`）。
+    assert rc == 1 and out["report_type"] == "plaza_open_preview" and out["opened"] is False
+
+
+def test_MCPのvisibility省略は組次第_明示すれば従う(tmp_path, monkeypatch):
+    _root, server = _tenant(tmp_path, monkeypatch)
+    # 組が無ければ従前どおり project（回帰固定）。
+    posted = json.loads(_text(_post(server)))
+    assert posted["scope"] == "project" and posted["visibility_default"] is None
+
+    plaza.set_owner("masaru", ["kopicha", "other"], by="operator")
+    # 省略すれば owner が既定。
+    defaulted = json.loads(_text(_post(server, title="省略で owner")))
+    assert defaulted["scope"] == "owner" and defaulted["visibility_default"] == "masaru"
+
+    # 明示すればそれに従う（組があっても project のまま）。
+    explicit = json.loads(_text(_post(server, title="明示は project", visibility="project")))
+    assert explicit["scope"] == "project" and explicit["visibility_default"] is None
+
+    # open は MCP の口に無い（既定にもならない・従前どおり）。
+    denied = _post(server, title="open は無い", visibility="open")
+    assert denied["isError"] and _text(denied) == "open_requires_cli"

thth-3.8.2/tests/test_v382_confirm_file.py

@@ -0,0 +1,218 @@
+"""3.8.2 件 2: `thth approve --confirm-file <file> --by <名前>`（複数の確定を 1 回で）。
+
+- 1 行に `<原稿のパス> <digest>`。1 回の同期と 1 回のロックの中で行の順に確定する。
+- digest が合わない本はその 1 本だけ断って他は進める（断った本と理由は最後に並べる）。
+- commit は 1 本ずつ・push は最後に 1 回。
+- 同期・push で止まったら、どこまで通ったかと残りをそのまま打てる命令を出す。
+- 1 段目（複数のとき）に `--confirm-file` の中身の形を 1 行。
+"""
+from __future__ import annotations
+
+import json
+import os
+import shlex
+
+import pytest
+
+from tests.conftest import run_git, run_thth, write_queue_file
+from thth import cli
+from thth import lock as lock_mod
+from thth import writeback
+
+NAMES = ["a.md", "b.md", "c.md"]
+
+
+def _digest(stdout: str) -> str:
+    return [line.split(": ", 1)[1].strip() for line in stdout.splitlines()
+            if line.startswith("digest: ")][0]
+
+
+@pytest.fixture
+def drafts(isolated_account, tmp_path):
+    """3 本の draft（commit・push 済み）と、それぞれの 1 段目の digest。"""
+    paths = [write_queue_file(isolated_account["queue_dir"], name,
+                              body=f"## threads\n\n{name} の本文です。\n",
+                              fm_overrides={"account": isolated_account["name"], "status": "draft",
+                                            "approved_sha": None})
+             for name in NAMES]
+    digests = []
+    for path in paths:
+        first = run_thth(["approve", path])
+        assert first.returncode == 1, first.stderr
+        digests.append(_digest(first.stdout))
+    work = isolated_account["repo_dir"]
+    return {"paths": paths, "digests": digests, "work": work,
+            "bare": os.path.join(os.path.dirname(work), "origin.git"),
+            "seed": os.path.join(os.path.dirname(work), "seed"),
+            "file": str(tmp_path / "confirm.txt")}
+
+
+def _write_confirm_file(drafts, digests=None, extra_lines=()) -> str:
+    digests = digests or drafts["digests"]
+    lines = ["# 確定の一覧（masaru）", ""]
+    lines += [f"{path} {digest}" for path, digest in zip(drafts["paths"], digests)]
+    lines += list(extra_lines)
+    with open(drafts["file"], "w", encoding="utf-8") as stream:
+        stream.write("\n".join(lines) + "\n")
+    return drafts["file"]
+
+
+def _origin_status(drafts, name: str) -> str:
+    shown = run_git(drafts["bare"], ["show", f"main:docs/sns/queue/{name}"]).stdout
+    return [line.split(": ", 1)[1] for line in shown.splitlines() if line.startswith("status: ")][0]
+
+
+def _approval_commits(repo: str, ref: str = "HEAD") -> list:
+    log = run_git(repo, ["log", "--format=%s", ref]).stdout.splitlines()
+    return [subject for subject in log if subject.startswith("承認: ")]
+
+
+def test_3本の組が全部通る_同期とロックとpushは1回ずつ_commitは1本ずつ(drafts, monkeypatch, capsys):
+    counts = {"sync": 0, "push": 0, "lock": 0}
+    real_sync, real_push, real_acquire = writeback.sync_repo, writeback.push_committed, lock_mod.acquire
+
+    def sync(repo_dir):
+        counts["sync"] += 1
+        return real_sync(repo_dir)
+
+    def push(repo_dir, **kwargs):
+        counts["push"] += 1
+        return real_push(repo_dir, **kwargs)
+
+    def acquire(lock, wait=0):
+        counts["lock"] += 1
+        return real_acquire(lock, wait)
+
+    monkeypatch.setattr(writeback, "sync_repo", sync)
+    monkeypatch.setattr(writeback, "push_committed", push)
+    monkeypatch.setattr(lock_mod, "acquire", acquire)
+
+    rc = cli.main(["approve", "--confirm-file", _write_confirm_file(drafts), "--by", "masaru"])
+    out, err = capsys.readouterr()
+
+    assert rc == 0, err
+    assert counts == {"sync": 1, "push": 1, "lock": 1}
+    assert out.splitlines()[0] == "承認しました: 3 本（masaru）"
+    for name in NAMES:
+        assert _origin_status(drafts, name) == "approved"
+    # commit は従前どおり 1 本ずつ（新しい順）。
+    assert _approval_commits(drafts["bare"], "main")[:3] == [
+        f"承認: {name}（nigamilab-threads・masaru）" for name in reversed(NAMES)]
+    assert "report_channel" not in err
+
+
+def test_1本だけdigestが違えばその1本だけ断り_他は進める(drafts, capsys):
+    digests = list(drafts["digests"])
+    digests[1] = "0" * 12
+    rc = cli.main(["approve", "--confirm-file", _write_confirm_file(drafts, digests), "--by", "masaru"])
+    out, err = capsys.readouterr()
+
+    assert rc == 1
+    assert out.splitlines()[0] == "承認しました: 2 本（masaru）"
+    assert _origin_status(drafts, "a.md") == "approved"
+    assert _origin_status(drafts, "b.md") == "draft"
+    assert _origin_status(drafts, "c.md") == "approved"
+    assert "断った原稿: 1 本（ほかは進めました）" in err
+    refused = [line for line in err.splitlines() if line.startswith("  4 行目 ")]
+    assert len(refused) == 1 and drafts["paths"][1] in refused[0]
+    assert f"いまの digest は {drafts['digests'][1]} です" in refused[0]
+
+
+def test_形の違う行とパスの無い行もその1行だけ断る(drafts, capsys):
+    path = _write_confirm_file(drafts, extra_lines=["digest-だけ", "/no/such/file.md " + "a" * 12])
+    rc = cli.main(["approve", "--confirm-file", path, "--by", "masaru", "--json"])
+    payload = json.loads(capsys.readouterr().out)
+
+    assert rc == 1
+    assert payload["count"] == 3 and payload["pushed"] is True
+    assert [row["line"] for row in payload["refused"]] == [6, 7]
+    assert payload["refused"][0]["reason"].startswith("行の形が違います")
+
+
+def test_pushに失敗したら_commitまで済んだ本とそのまま打てるpushの命令を出す(drafts, capsys):
+    hook = os.path.join(drafts["bare"], "hooks", "pre-receive")
+    with open(hook, "w", encoding="utf-8") as stream:
+        stream.write("#!/bin/sh\necho 'rejected for test' >&2\nexit 1\n")
+    os.chmod(hook, 0o755)
+
+    rc = cli.main(["approve", "--confirm-file", _write_confirm_file(drafts), "--by", "masaru"])
+    out, err = capsys.readouterr()
+
+    assert rc == 1
+    assert "まだ push できていません" in out.splitlines()[0]
+    assert "承認を commit しましたが push できませんでした" in err
+    push_line = [line for line in err.splitlines() if "push が通れば出ます: " in line][0]
+    command = push_line.split("push が通れば出ます: ", 1)[1]
+    # 次の一手は thth の命令（3.8.2 の裁定 2・VM で生の git を打たせない）。
+    assert command == "thth pull nigamilab-threads --push-pending --by masaru"
+    # 3 本とも commit はローカルに残り、origin にはまだ無い。
+    assert len(_approval_commits(drafts["work"])) == 3
+    assert _approval_commits(drafts["bare"], "main") == []
+    # 出した命令をそのまま打てば届く（hook を外してから）。
+    os.unlink(hook)
+    pushed = run_thth(shlex.split(command)[1:])
+    assert pushed.returncode == 0, pushed.stderr
+    assert pushed.stdout.splitlines()[0] == "nigamilab-threads: 押しました: 3 commit（masaru）"
+    for name in NAMES:
+        assert _origin_status(drafts, name) == "approved"
+
+
+def test_同期で止まったら_残りをそのまま打てる確定の命令で出す(drafts, capsys):
+    # 手元に push していない commit があり、origin も進んでいる（ff できない）。
+    work = drafts["work"]
+    with open(os.path.join(work, "local.txt"), "w", encoding="utf-8") as stream:
+        stream.write("local\n")
+    run_git(work, ["add", "local.txt"])
+    run_git(work, ["commit", "-q", "-m", "local only"])
+    run_git(drafts["seed"], ["pull", "-q", "--ff-only"])
+    with open(os.path.join(drafts["seed"], "elsewhere.txt"), "w", encoding="utf-8") as stream:
+        stream.write("elsewhere\n")
+    run_git(drafts["seed"], ["add", "elsewhere.txt"])
+    run_git(drafts["seed"], ["commit", "-q", "-m", "elsewhere"])
+    run_git(drafts["seed"], ["push", "-q"])
+
+    rc = cli.main(["approve", "--confirm-file", _write_confirm_file(drafts), "--by", "masaru"])
+    out, err = capsys.readouterr()
+
+    assert rc == 1 and out == ""
+    assert err.splitlines()[0].startswith("repo を同期できないので承認しません: ")
+    assert "通ったもの: 0 本。残り 3 本はそのまま打てます:" in err
+    commands = [line.strip() for line in err.splitlines() if line.startswith("  thth approve ")]
+    assert commands == [f"thth approve {shlex.quote(path)} --confirm {digest} --by masaru"
+                        for path, digest in zip(drafts["paths"], drafts["digests"])]
+    for path in drafts["paths"]:
+        assert "status: draft" in open(path, encoding="utf-8").read()
+    # 直したあと、出た命令をそのまま打てば通る。
+    run_git(work, ["reset", "-q", "--hard", "origin/main"])
+    result = run_thth(shlex.split(commands[0])[1:])
+    assert result.returncode == 0, result.stderr
+
+
+def test_confirm_fileにハイフンを渡すと標準入力から読む(drafts):
+    """手元（Mac）のファイルは VM に無いので、`--confirm-file -` で標準入力から渡せる。"""
+    lines = "".join(f"{path} {digest}\n" for path, digest in zip(drafts["paths"], drafts["digests"]))
+    result = run_thth(["approve", "--confirm-file", "-", "--by", "masaru"], stdin=lines)
+    assert result.returncode == 0, result.stderr
+    assert result.stdout.splitlines()[0] == "承認しました: 3 本（masaru）"
+    missing = run_thth(["approve", "--confirm-file", "/Users/someone/confirm.txt", "--by", "masaru"])
+    assert missing.returncode == 2 and "手元のパス" in missing.stderr
+
+
+def test_1段目が複数のときconfirm_fileの形を1行添える(drafts):
+    first = run_thth(["approve", drafts["paths"][0], drafts["paths"][1]])
+    assert first.returncode == 1
+    lines = [line for line in first.stdout.splitlines() if "--confirm-file" in line]
+    assert lines == ["1 本ずつの digest で確定するなら: thth approve --confirm-file <file> --by <名前>"
+                     "（<file> は 1 行に「<原稿のパス> <digest>」）"]
+    single = run_thth(["approve", drafts["paths"][0]])
+    assert "--confirm-file" not in single.stdout
+
+
+def test_confirm_fileは名指しや_confirmと一緒に使えない(drafts, capsys):
+    path = _write_confirm_file(drafts)
+    assert cli.main(["approve", drafts["paths"][0], "--confirm-file", path, "--by", "m"]) == 2
+    assert cli.main(["approve", "--confirm-file", path, "--confirm", "a" * 12, "--by", "m"]) == 2
+    assert cli.main(["approve"]) == 2
+    capsys.readouterr()
+    for path in drafts["paths"]:
+        assert "status: draft" in open(path, encoding="utf-8").read()

thth-3.8.2/tests/test_v382_first_stage_not_refusal.py

@@ -0,0 +1,112 @@
+"""3.8.2 件 3: 二段確認の 1 段目を「断り」に数えない（報告 r20260924-9f07f36b）。
+
+実測: `thth approve` の 1 段目（digest を出すだけ・rc 1）の末尾に
+`report_channel: … --title "exit_1 で断られた"` が付き、3.3.0 の直前の断りの控え
+（`last_refusals`）にも入っていた。
+
+- approve の 1 段目と広場の open の 1 段目は、rc 1 のまま（呼び出し側を壊さない）、
+  断りの行を出さず、`last_refusals` にも記録しない。
+- つまずきの年表の材料にもならない（`--from-last-refusal` が拾うものが無い）。
+- 本当の断り（digest 違い）では従前どおり出る・記録する。
+"""
+from __future__ import annotations
+
+import json
+import os
+
+import pytest
+
+from tests.conftest import write_queue_file
+from thth import accounts, cli, plaza, refusals, report_timeline
+from tests.test_v340_plaza_open import ledger, join  # noqa: F401  (fixture)
+from tests.test_v340_plaza_store import owners  # noqa: F401  (fixture)
+
+
+def _draft(account):
+    return write_queue_file(account["queue_dir"], "a.md", body="## threads\n\n1 段目の本文。\n",
+                            fm_overrides={"account": account["name"], "status": "draft",
+                                          "approved_sha": None})
+
+
+def _refusal_file(account_name):
+    return os.path.join(accounts.state_dir_for(account_name), refusals.FILE)
+
+
+def test_approveの1段目はreport_channelを出さず_last_refusalsにも入らない(isolated_account, tmp_path, capsys):
+    name = isolated_account["name"]
+    path = _draft(isolated_account)
+
+    assert cli.main(["approve", path, "--account", name]) == 1
+    out, err = capsys.readouterr()
+
+    assert "digest: " in out  # 1 段目は出ている（rc も従前どおり 1）
+    assert "report_channel" not in err and "report_channel" not in out
+    assert "で断られた" not in err
+    assert refusals.read(name) == []
+    assert not os.path.exists(_refusal_file(name))
+    # 年表の材料にもならない（直前の断りの控えが無い）。
+    assert cli.main(["report", "file", name, "--kind", "friction", "--from-last-refusal",
+                     "--title", "1 段目", "--by", "テスト"]) != 0
+    assert "no_last_refusal" in capsys.readouterr().err
+    scope = report_timeline.report_inbox.Scope([name], ["nigamilab"])
+    assert report_timeline.timeline(scope, notes_dir=tmp_path)["rows"] == []
+
+
+def test_approveのjsonの1段目も断りに数えない(isolated_account, capsys):
+    name = isolated_account["name"]
+    path = _draft(isolated_account)
+    assert cli.main(["approve", path, "--account", name, "--json"]) == 1
+    out, err = capsys.readouterr()
+    assert json.loads(out)["not_until_confirmed"] is True
+    assert "report_channel" not in err
+    assert refusals.read(name) == []
+
+
+def test_digest違いの本当の断りでは従前どおり出て記録する(isolated_account, capsys):
+    name = isolated_account["name"]
+    path = _draft(isolated_account)
+    assert cli.main(["approve", path, "--account", name]) == 1
+    capsys.readouterr()
+
+    rc = cli.main(["approve", path, "--account", name, "--confirm", "0" * 12, "--by", "テスト"])
+    err = capsys.readouterr().err
+
+    assert rc == 1
+    assert err.splitlines()[0].startswith("digest が一致しないので承認しません")
+    assert err.splitlines()[-1].startswith(f"report_channel: thth report file {name} ")
+    [row] = refusals.read(name)
+    assert row["command"] == "approve" and row["reason_code"] == "exit_1"
+    # 次の cli.main で印は持ち越さない（1 段目の直後の本当の断りも数える）。
+    assert not refusals.is_first_stage()
+
+
+def test_広場のopenの1段目も断りに数えない(owners, ledger, tmp_path, capsys):
+    join("kopicha")
+    body = tmp_path / "b.txt"
+    body.write_text("朝の問いを続けた", encoding="utf-8")
+    argv = ["plaza", "post", "kopicha-threads", "--kind", "finding", "--title", "朝の問い",
+            "--body-file", str(body), "--scope", "Threads の朝", "--open", "--by", "s"]
+
+    assert cli.main(argv) == 1
+    out, err = capsys.readouterr()
+    assert out.startswith("一段目: まだ open にしていません")
+    assert "report_channel" not in err
+    assert refusals.read("kopicha-threads") == []
+
+    # 二段目の digest 違いは本当の断り（従前どおり）。
+    assert cli.main(argv + ["--confirm", "x" * 20]) == 2
+    assert "report_channel" in capsys.readouterr().err
+    [row] = refusals.read("kopicha-threads")
+    assert row["command"] == "plaza post"
+    assert plaza.admin_list()["n"] == 0
+
+
+@pytest.mark.parametrize("json_flag", [[], ["--json"]], ids=["text", "json"])
+def test_広場のupdateでopenにする1段目も断りに数えない(owners, capsys, json_flag):
+    join("kopicha")
+    inside = plaza.post("kopicha-bsky", kind="question", title="内輪の問い", body="b",
+                        scope_note="Bluesky", by="b")
+    argv = ["plaza", "update", inside["plaza_id"], "--as", "kopicha-bsky", "--visibility", "open",
+            "--by", "b", *json_flag]
+    assert cli.main(argv) == 1
+    assert "report_channel" not in capsys.readouterr().err

thth-3.8.2/tests/test_v382_reader_lock_and_push_pending.py

@@ -0,0 +1,105 @@
+"""3.8.2 の裁定 2 点（主セッション・2026-09-24）。
+
+1. `writeback.behind_remote()`（読むだけの口の遅れの確かめ）は repo のロックを待たずに
+   取りに行き、取れなければ fetch せず、前回取り込んだ remote の姿で数えて「いま確かめ
+   られない（他の実行が repo を使用中）」と言う。取れたら fetch する（FETCH_HEAD は書かない）。
+   承認の手元パスの読み替え（`_stale_clone_line()`）と queue 等の案内（`_behind_notices()`）も同じ。
+2. `thth pull <account> --push-pending --by <名前>`: repo のロックの中で fetch し、手元が
+   upstream より先にいて遅れが 0 のときだけ push する。遅れがあれば押さずに理由を言う
+   （rebase はしない）。押した commit の件数と題を出す。
+"""
+from __future__ import annotations
+
+import json
+import os
+
+from tests.conftest import run_git
+from thth import accounts, cli, writeback
+from thth import lock as lock_mod
+
+
+def _paths(account):
+    work = account["repo_dir"]
+    return work, os.path.join(os.path.dirname(work), "seed"), os.path.join(os.path.dirname(work), "origin.git")
+
+
+def _advance(repo: str, name: str, *, push: bool = True) -> None:
+    with open(os.path.join(repo, name), "w", encoding="utf-8") as stream:
+        stream.write(name + "\n")
+    run_git(repo, ["add", name])
+    run_git(repo, ["commit", "-q", "-m", f"commit {name}"])
+    if push:
+        run_git(repo, ["push", "-q"])
+
+
+# ------------------------------------------------------------ 1. ロック中の読み手は fetch しない
+
+def test_repoのロック中はfetchせず前回の姿で数えて確かめられないと言う_空けばfetchする(isolated_account):
+    work, seed, _bare = _paths(isolated_account)
+    tracked_before = run_git(work, ["rev-parse", "origin/main"]).stdout.strip()
+    _advance(seed, "elsewhere.txt")  # origin が 1 commit 進む（work はまだ知らない）
+
+    held = lock_mod.AccountLock(accounts.repo_lock_path_for(work))
+    held.acquire()
+    try:
+        info = writeback.behind_remote(work)
+        notices, _by_account = cli._behind_notices([isolated_account["name"]])
+        stale = cli._stale_clone_line(work, isolated_account["name"])
+    finally:
+        held.release()
+
+    # fetch していない: 追跡 ref は動かず、前回の姿で数えて 0・確かめた時刻は無い。
+    assert run_git(work, ["rev-parse", "origin/main"]).stdout.strip() == tracked_before
+    assert info["reason"] == writeback.BEHIND_UNCHECKED
+    assert info["behind"] == 0 and info["ahead"] == 0 and info["fetched_at"] is None
+    assert any("いま確かめられません（他の実行が repo を使用中）" in line for line in notices)
+    assert stale is not None and "いま確かめられません（他の実行が repo を使用中）" in stale
+
+    # 空けば従前どおり fetch して数える（FETCH_HEAD は書かない）。
+    fetch_head = os.path.join(work, ".git", "FETCH_HEAD")
+    before = os.path.getmtime(fetch_head) if os.path.exists(fetch_head) else None
+    info = writeback.behind_remote(work)
+    assert info["reason"] is None and info["behind"] == 1 and info["fetched_at"]
+    after = os.path.getmtime(fetch_head) if os.path.exists(fetch_head) else None
+    assert after == before
+
+
+# ------------------------------------------------------------ 2. --push-pending
+
+def test_push_pendingは手元が先にいるだけなら押して件数と題を出す(isolated_account, capsys):
+    work, _seed, bare = _paths(isolated_account)
+    _advance(work, "a.txt", push=False)
+    _advance(work, "b.txt", push=False)
+
+    rc = cli.main(["pull", isolated_account["name"], "--push-pending", "--by", "masaru"])
+    out, err = capsys.readouterr()
+
+    assert rc == 0, err
+    assert out.splitlines() == [f"{isolated_account['name']}: 押しました: 2 commit（masaru）",
+                                "  commit b.txt", "  commit a.txt"]
+    assert run_git(bare, ["rev-parse", "main"]).stdout.strip() == \
+        run_git(work, ["rev-parse", "HEAD"]).stdout.strip()
+
+
+def test_push_pendingはupstreamに遅れていれば押さずに理由を言う_rebaseもしない(isolated_account, capsys):
+    work, seed, bare = _paths(isolated_account)
+    _advance(work, "a.txt", push=False)
+    local_head = run_git(work, ["rev-parse", "HEAD"]).stdout.strip()
+    _advance(seed, "elsewhere.txt")
+    origin_head = run_git(bare, ["rev-parse", "main"]).stdout.strip()
+
+    rc = cli.main(["pull", isolated_account["name"], "--push-pending", "--by", "masaru", "--json"])
+    [row] = json.loads(capsys.readouterr().out)
+
+    assert rc == 1
+    assert row["pushed"] is False and row["ahead"] == 1 and row["behind"] == 1
+    assert row["error"].startswith("upstream に 1 commit 遅れているので押しません")
+    # 手元も origin も動かさない（rebase しない・押さない）。
+    assert run_git(work, ["rev-parse", "HEAD"]).stdout.strip() == local_head
+    assert run_git(bare, ["rev-parse", "main"]).stdout.strip() == origin_head
+
+
+def test_push_pendingは名乗りが要る(isolated_account, capsys, monkeypatch):
+    monkeypatch.delenv("THTH_ACTOR", raising=False)
+    assert cli.main(["pull", isolated_account["name"], "--push-pending"]) == 1
+    assert "--by を付けてください" in capsys.readouterr().err