thth 4.5.2__tar.gz → 4.5.3__tar.gz

{thth-4.5.2 → thth-4.5.3}/PKG-INFO

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

{thth-4.5.2 → thth-4.5.3}/bin/thth-remote

@@ -54,4 +54,26 @@ esac
 if [ -n "$TTY_FLAG" ]; then
   exec ssh -t "$HOST" "$REMOTE"
 fi
-exec ssh "$HOST" "$REMOTE"
+
+# 4.5.3: 標準入力は、読むと分かっているときだけ VM へ渡す（こぴちゃ 第3 の 3）。
+# `while read f; do thth revoke "$f"; done < list` が 1 本で止まった——VM の thth は標準入力を
+# 読まないのに、**ssh が手元の標準入力を先に吸い上げて VM へ送っていた**（ループの残りの行が消える）。
+# 渡すのは: 引数に `-`（`--confirm-file -`・`bookmark batch <口座> -`・`revoke -` など）か `…=-` か
+# `--…stdin`（`--stdin`・`--json-stdin`・`--secret-stdin` など）があるとき、と、`send` で本文の引数
+# （`--text`・`--text-file`・`--media`）が無いとき（4.4.2 で案内した `thth send <口座> … < <ファイル>`
+# の互換）。それ以外は `ssh -n`（標準入力を /dev/null に）。
+STDIN_WANTED=""
+SEND_BODY_GIVEN=""
+for arg in "$@"; do
+  case "$arg" in
+    -|*=-|--*stdin) STDIN_WANTED=1 ;;
+    --text|--text=*|--text-file|--text-file=*|--media|--media=*) SEND_BODY_GIVEN=1 ;;
+  esac
+done
+if [ "${1:-}" = "send" ] && [ -z "$SEND_BODY_GIVEN" ]; then
+  STDIN_WANTED=1
+fi
+if [ -n "$STDIN_WANTED" ]; then
+  exec ssh "$HOST" "$REMOTE"
+fi
+exec ssh -n "$HOST" "$REMOTE"

{thth-4.5.2 → thth-4.5.3}/mcp/server.py

@@ -821,7 +821,8 @@ SERVER_TOOLS = [
         ('schedule_request',('draft_id','confirm','approval'),('draft_id',)),
         # 4.0 S1 §7.3: はてなブックマーク（2 段・送信は S4）。tags は a,b の 1 行。
         # 4.0 S4 §11: delivery（自分の記事）か url（参照先）のどちらか 1 つ・op は add（既定）か delete。
-        ('bookmark_request',('delivery','url','comment','tags','confirm','op'),()),
+        # 4.5.3: approval（hub の承認の番号）。口座の台帳が require_gate: true なら --production に要る。
+        ('bookmark_request',('delivery','url','comment','tags','confirm','op','approval'),()),
         ('draft_list',(),()),('queue',(),())) ]
 
 # 公開・削除・予約の 3 本は、頼まれたらその場で行う（承認ページは無い・設計 3.13.0）。安全装置は効く。
@@ -858,7 +859,7 @@ SERVER_TOOLS += [
                     "付けると順番待ちに置く。付けるのは timer（7〜23 時・上限と連投の窓の中で 1 件ずつ間を散らし、1 件ごとに"
                     "1 件ずつの承認と同じ柵を通す）。結果が分からない札は打ち直さない",
      "inputSchema": {"type": "object", "properties": {"account": {"type": "string"}, "text": {"type": "string"},
-                                                      "confirm": {"type": "string"}},
+                                                      "confirm": {"type": "string"}, "approval": {"type": "string"}},
                      "required": ["account", "text"], "additionalProperties": False}},
     {"name": "thth_bookmark_batch_status",
      "description": "まとめて承認したブックマークの札の状態（読むだけ）: まとめごとの数・待ち・付けた・結果不明・断った札と理由・"
@@ -1192,10 +1193,12 @@ REMOTE_CLI = {
                                            if a.get("op") not in ("delete", "edit") or
                                            (a.get("op") == "edit" and a.get("comment") is not None) else []),
                                          *_opt("--tags", a.get("tags")),
-                                         *_opt("--confirm", a.get("confirm")), "--production", "--json"], None),
+                                         *_opt("--confirm", a.get("confirm")),
+                                         *_opt("--approval", a.get("approval")), "--production", "--json"], None),
     # 4.1: 札のファイルの中身は標準入力で（`thth bookmark batch <口座> -`）。
     "thth_bookmark_batch_request": (lambda a: ["bookmark", "batch", a["account"], "-",
-                                               *_opt("--confirm", a.get("confirm")), "--production", "--json"], "text"),
+                                               *_opt("--confirm", a.get("confirm")),
+                                               *_opt("--approval", a.get("approval")), "--production", "--json"], "text"),
     "thth_bookmark_batch_status": (lambda a: ["bookmark", "batch-status", a["account"], "--json",
                                               *_opt("--batch", a.get("batch"))], None),
     "thth_bookmark_batch_cancel": (lambda a: ["bookmark", "batch-cancel", a["account"], a["batch"], "--json",

{thth-4.5.2 → thth-4.5.3}/tests/test_v3142_browser_login.py

@@ -327,7 +327,8 @@ def test_ラッパは_login_logout_だけ手元の_thth_に渡す(shims, argv):
 def test_ラッパはそれ以外を今までどおり_VM_へ(shims, argv):
     rc, log = call_wrapper(shims, *argv)
     assert rc == 0
-    assert log.startswith("ssh wt ") and log.count("\n") == 1, "手元の thth は呼ばれない"
+    # 4.5.3: 標準入力を読まない命令は `ssh -n`（ループの標準入力を吸わない）。
+    assert log.startswith("ssh -n wt ") and log.count("\n") == 1, "手元の thth は呼ばれない"
     assert log.rstrip("\n").endswith("exec thth" + "".join(" " + a for a in argv))
 
 

{thth-4.5.2 → thth-4.5.3}/tests/test_v400_s4_bookmark.py

@@ -533,7 +533,9 @@ def test_T_S4_10b_MCPに足すのは引数だけで道具は足さない(mcp_ser
     assert first_table == BEFORE_S4_SERVER_TOOLS
     assert not [n for n in names if "announce" in n]
     tool = next(t for t in mcp_server.SERVER_TOOLS if t["name"] == "thth_bookmark_request")
-    assert set(tool["inputSchema"]["properties"]) == {"account", "delivery", "url", "comment", "tags", "confirm", "op"}
+    # 4.5.3: approval（hub の承認の番号・require_gate: true の口座の --production に要る）も引数として足した。
+    assert set(tool["inputSchema"]["properties"]) == {"account", "delivery", "url", "comment", "tags", "confirm", "op",
+                                                      "approval"}
     build, _ = mcp_server.REMOTE_CLI["thth_bookmark_request"]
     assert build({"account": "a", "url": EXTERNAL, "comment": "c"}) == [
         "bookmark", "add", "a", "--url=" + EXTERNAL, "--comment=c", "--production", "--json"]

thth-4.5.3/tests/test_v453_approve_redo.py

@@ -0,0 +1,264 @@
+"""4.5.3 の柵: 承認のやり直しの手数（計画 4.4.3・こぴちゃ 第3 の 2・3・6）。
+
+- (1) `thth approve --digest-only`: 本文を出さず束の digest を 1 行だけ標準出力へ。lint の誤りは標準エラーと
+  rc 1。`--confirm` とは一緒に使えない。出した digest で `--confirm` が通る。
+- (2) `thth revoke` の複数・ディレクトリ・`--account`・`-`（標準入力のパスの並び）。取り消せない本だけ断る。
+  同期は repo ごとに 1 回（と書いたあとの見直しの 1 回）。相対パスが 2 つの repo に当たっても `--account` で解ける。
+- (3) 手元のラッパ（`bin/thth-remote`）は、`-`・`--…stdin`・本文の引数の無い `send` のときだけ
+  標準入力を VM へ渡す。それ以外は `ssh -n`（`while read` のループの入力を吸わない）。
+- (4) 承認済みの原稿の本文を直したら、revoke せずに approve の 2 段で承認し直せる。1 段目が「差し替わる」と言う。
+"""
+from __future__ import annotations
+
+import json
+import os
+import subprocess
+from pathlib import Path
+
+from tests.conftest import approve_via_cli, init_git_pair, make_queue_text, run_git, run_thth
+from thth import approval_ledger
+
+REL = "docs/sns/queue/a.md"
+
+
+def _setup(tmp_path, factory, *, name=None, sub="r1", fm=None, body="## threads\n\nBODY_A\n"):
+    fm = {"status": "draft", **({"account": name} if name else {}), **(fm or {})}
+    pair = init_git_pair(tmp_path / sub, seed_content=make_queue_text(fm, body=body))
+    kwargs = {"name": name} if name else {}
+    acct = factory(repo_dir=pair["work"], production=True, quiet_hours=None, min_interval_hours=0, **kwargs)
+    return pair, acct
+
+
+def _push(pair, rel, text, message="add"):
+    seed = Path(pair["seed"]) / rel
+    run_git(pair["seed"], ["pull", "-q", "--ff-only"])
+    seed.parent.mkdir(parents=True, exist_ok=True)
+    seed.write_text(text, encoding="utf-8")
+    run_git(pair["seed"], ["add", rel])
+    run_git(pair["seed"], ["commit", "-q", "-m", message])
+    run_git(pair["seed"], ["push", "-q"])
+    run_git(pair["work"], ["pull", "-q", "--ff-only"])
+    return Path(pair["work"]) / rel
+
+
+def _digest_lines(stdout):
+    return [line.split(": ", 1)[1].strip() for line in stdout.splitlines()
+            if line.startswith(("digest: ", "束の digest: "))]
+
+
+# ---------------------------------------------------------------- (1) --digest-only
+
+def test_digest_only_prints_one_line_and_confirms(tmp_path, isolated_account_factory):
+    pair, acct = _setup(tmp_path, isolated_account_factory)
+    path = str(Path(pair["work"]) / REL)
+    full = run_thth(["approve", path])
+    assert full.returncode == 1
+    only = run_thth(["approve", path, "--digest-only"])
+    assert only.returncode == 0, only.stderr
+    assert only.stdout.splitlines() == [_digest_lines(full.stdout)[-1]]
+    assert "BODY_A" not in only.stdout and "BODY_A" not in only.stderr
+    done = run_thth(["approve", path, "--confirm", only.stdout.strip(), "--by", "テスト"])
+    assert done.returncode == 0, done.stderr
+    assert approval_ledger.load(acct["name"])[REL]["state"] == "approved"
+
+
+def test_digest_only_bundles_many_files_into_one_digest(tmp_path, isolated_account_factory):
+    pair, _acct = _setup(tmp_path, isolated_account_factory)
+    second = _push(pair, "docs/sns/queue/b.md", make_queue_text({"status": "draft"}, body="## threads\n\nBODY_B\n"))
+    first = str(Path(pair["work"]) / REL)
+    full = run_thth(["approve", first, str(second)])
+    only = run_thth(["approve", first, str(second), "--digest-only"])
+    assert only.returncode == 0, only.stderr
+    assert len(only.stdout.splitlines()) == 1
+    assert only.stdout.strip() == _digest_lines(full.stdout)[-1]   # 束の digest
+
+
+def test_digest_only_lint_error_goes_to_stderr_and_rc1(tmp_path, isolated_account_factory):
+    pair, _acct = _setup(tmp_path, isolated_account_factory, body="## threads\n\n#tag1 #tag2 本文\n")
+    bad = run_thth(["approve", str(Path(pair["work"]) / REL), "--digest-only"])
+    assert bad.returncode == 1
+    assert bad.stdout == ""
+    assert "lint に通りません" in bad.stderr
+
+
+def test_digest_only_json_has_no_body(tmp_path, isolated_account_factory):
+    pair, _acct = _setup(tmp_path, isolated_account_factory)
+    only = run_thth(["approve", str(Path(pair["work"]) / REL), "--digest-only", "--json"])
+    assert only.returncode == 0, only.stderr
+    data = json.loads(only.stdout)
+    assert data["digest_only"] is True and data["ok"] is True and len(data["bundle_digest"]) == 12
+    assert "BODY_A" not in only.stdout
+    assert all("text" not in row and "segments" not in row for row in data["files"])
+
+
+def test_digest_only_refuses_with_confirm(tmp_path, isolated_account_factory):
+    pair, _acct = _setup(tmp_path, isolated_account_factory)
+    both = run_thth(["approve", str(Path(pair["work"]) / REL), "--digest-only", "--confirm", "0" * 12])
+    assert both.returncode == 2
+    assert "--digest-only" in both.stderr
+
+
+# ---------------------------------------------------------------- (2) revoke の複数
+
+def _three(tmp_path, factory):
+    """承認済み 2 本（a・b）と下書き 1 本（c）。"""
+    pair, acct = _setup(tmp_path, factory)
+    b = _push(pair, "docs/sns/queue/b.md", make_queue_text({"status": "draft"}, body="## threads\n\nBODY_B\n"))
+    c = _push(pair, "docs/sns/queue/c.md", make_queue_text({"status": "draft"}, body="## threads\n\nBODY_C\n"))
+    a = Path(pair["work"]) / REL
+    for path in (a, b):
+        assert approve_via_cli(str(path)).returncode == 0
+    return pair, acct, a, b, c
+
+
+def test_revoke_many_refuses_only_the_one_that_cannot(tmp_path, isolated_account_factory):
+    _pair, acct, a, b, c = _three(tmp_path, isolated_account_factory)
+    # 断る本（c・下書き）を先頭に置く: 1 本目の断りで残りを止めない。
+    result = run_thth(["revoke", str(c), str(a), str(b), "--by", "テスト", "--json"])
+    assert result.returncode == 1, result.stderr
+    data = json.loads(result.stdout)
+    assert [Path(r["file"]).name for r in data["revoked"]] == ["a.md", "b.md"]
+    assert [Path(r["file"]).name for r in data["refused"]] == ["c.md"]
+    assert "承認されていません" in data["refused"][0]["reason"]
+    ledger = approval_ledger.load(acct["name"])
+    assert ledger[REL]["state"] == ledger["docs/sns/queue/b.md"]["state"] == "revoked"
+
+
+def test_revoke_directory_picks_only_approved(tmp_path, isolated_account_factory):
+    pair, acct, _a, _b, _c = _three(tmp_path, isolated_account_factory)
+    result = run_thth(["revoke", str(Path(pair["work"]) / "docs/sns/queue"), "--by", "テスト"])
+    assert result.returncode == 0, result.stderr
+    assert "取り消し 2 本・断った 0 本" in result.stdout
+    assert approval_ledger.load(acct["name"])["docs/sns/queue/b.md"]["state"] == "revoked"
+
+
+def test_revoke_paths_from_stdin_only_with_dash(tmp_path, isolated_account_factory):
+    _pair, acct, a, b, _c = _three(tmp_path, isolated_account_factory)
+    result = run_thth(["revoke", "-", "--by", "テスト"], stdin=f"{a}\n\n# 注釈\n{b}\n")
+    assert result.returncode == 0, result.stderr
+    assert "取り消し 2 本" in result.stdout
+    assert approval_ledger.load(acct["name"])[REL]["state"] == "revoked"
+
+
+def test_revoke_syncs_and_locks_once_per_repo(tmp_path, isolated_account_factory, monkeypatch, capsys):
+    import argparse
+    from thth import cli as cli_mod
+    _pair, _acct, a, b, _c = _three(tmp_path, isolated_account_factory)
+    calls = {"sync": 0, "lock": 0}
+    real_sync, real_acquire = cli_mod.writeback_mod.sync_repo, cli_mod.lock_mod.acquire
+
+    def sync(repo):
+        calls["sync"] += 1
+        return real_sync(repo)
+
+    def acquire(lock, seconds=0):
+        calls["lock"] += 1
+        return real_acquire(lock, seconds)
+    monkeypatch.setattr(cli_mod.writeback_mod, "sync_repo", sync)
+    monkeypatch.setattr(cli_mod.lock_mod, "acquire", acquire)
+    rc = cli_mod.cmd_revoke(argparse.Namespace(file=[str(a), str(b)], reason=None, by="テスト", json=False,
+                                               account=None, wait=0))
+    capsys.readouterr()
+    assert rc == 0
+    # 取り消しの前の同期 1 回と、書いたあとの見直しの 1 回（1 本ずつではない）。
+    assert calls == {"sync": 2, "lock": 1}
+
+
+def test_revoke_account_resolves_same_relative_path_in_two_repos(tmp_path, isolated_account_factory):
+    first, acct1 = _setup(tmp_path, isolated_account_factory, sub="r1")
+    second, acct2 = _setup(tmp_path, isolated_account_factory, name="other-threads", sub="r2")
+    for pair in (first, second):
+        assert approve_via_cli(str(Path(pair["work"]) / REL)).returncode == 0
+    ambiguous = run_thth(["revoke", REL, "--by", "テスト"], cwd=str(tmp_path))
+    assert ambiguous.returncode == 2
+    assert "複数の repo に同じパス" in ambiguous.stderr and "--account" in ambiguous.stderr
+    chosen = run_thth(["revoke", REL, "--account", "other-threads", "--by", "テスト"], cwd=str(tmp_path))
+    assert chosen.returncode == 0, chosen.stderr
+    assert approval_ledger.load(acct2["name"])[REL]["state"] == "revoked"
+    assert approval_ledger.load(acct1["name"])[REL]["state"] == "approved"
+
+
+def test_approve_account_also_resolves_same_relative_path(tmp_path, isolated_account_factory):
+    _setup(tmp_path, isolated_account_factory, sub="r1")
+    _setup(tmp_path, isolated_account_factory, name="other-threads", sub="r2")
+    first = run_thth(["approve", REL, "--account", "other-threads", "--digest-only"], cwd=str(tmp_path))
+    assert first.returncode == 0, first.stderr
+    assert "r2" in first.stderr   # 解いた先は other-threads の repo
+
+
+# ---------------------------------------------------------------- (3) ラッパの標準入力
+
+WRAPPER = Path(__file__).resolve().parents[1] / "bin" / "thth-remote"
+
+
+def _wrapper_env(tmp_path):
+    """偽の ssh: `-n` が無ければ標準入力を読み切る（本物の ssh と同じく VM へ送る形）。呼ばれた形を書く。"""
+    bin_dir = tmp_path / "bin"
+    bin_dir.mkdir()
+    log = tmp_path / "ssh.log"
+    ssh = bin_dir / "ssh"
+    ssh.write_text('#!/bin/sh\n'
+                   'if [ "$1" = "-n" ]; then printf "n\\n" >> "' + str(log) + '"; '
+                   'else cat > /dev/null; printf "stdin\\n" >> "' + str(log) + '"; fi\n')
+    ssh.chmod(0o755)
+    wrapper = tmp_path / "thth"
+    wrapper.write_text(WRAPPER.read_text())
+    wrapper.chmod(0o755)
+    return wrapper, {"PATH": f"{bin_dir}:/usr/bin:/bin", "HOME": str(tmp_path)}, log
+
+
+def test_wrapper_does_not_eat_loop_stdin(tmp_path):
+    wrapper, env, log = _wrapper_env(tmp_path)
+    script = f'while read f; do /bin/bash "{wrapper}" revoke "$f" --by t; done'
+    subprocess.run(["/bin/bash", "-c", script], input="a.md\nb.md\nc.md\n", env=env, text=True, timeout=30,
+                   check=True)
+    assert log.read_text().splitlines() == ["n", "n", "n"]
+
+
+def test_wrapper_forwards_stdin_only_when_asked(tmp_path):
+    wrapper, env, log = _wrapper_env(tmp_path)
+    cases = [
+        (["revoke", "-", "--by", "t"], "stdin"),
+        (["approve", "--confirm-file", "-", "--by", "t"], "stdin"),
+        (["token", "set", "acct", "--stdin"], None),          # tty を割り当てる道（-t）は変えない
+        (["topics", "observe", "--json-stdin"], "stdin"),
+        (["send", "acct"], "stdin"),                           # 4.4.2 で案内した `send … < <ファイル>`
+        (["send", "acct", "--text-file", "-"], "stdin"),
+        (["send", "acct", "--text-file", "x.txt"], "n"),
+        (["send", "acct", "--text", "hi"], "n"),
+        (["approve", "docs/sns/queue/a.md"], "n"),
+    ]
+    for argv, expected in cases:
+        if log.exists():
+            log.unlink()
+        subprocess.run(["/bin/bash", str(wrapper), *argv], input="x\n", env=env, text=True, timeout=30,
+                       check=True)
+        if expected is None:
+            continue
+        assert log.read_text().splitlines() == [expected], argv
+
+
+# ---------------------------------------------------------------- (4) 本文の差し替え
+
+def test_reapprove_after_edit_without_revoke(tmp_path, isolated_account_factory):
+    pair, acct = _setup(tmp_path, isolated_account_factory)
+    path = Path(pair["work"]) / REL
+    assert approve_via_cli(str(path)).returncode == 0
+    old_sha = approval_ledger.load(acct["name"])[REL]["approved_sha"]
+    _push(pair, REL, (Path(pair["seed"]) / REL).read_text().replace("BODY_A", "BODY_B"), "edit")
+    first = run_thth(["approve", str(path)])
+    assert first.returncode == 1
+    assert "差し替わります" in first.stdout and "revoke は要りません" in first.stdout
+    assert old_sha[:12] in first.stdout
+    as_json = json.loads(run_thth(["approve", str(path), "--json"]).stdout)
+    assert as_json["files"][0]["replaces"]["approved_sha"] == old_sha[:12]
+    again = approve_via_cli(str(path))
+    assert again.returncode == 0, again.stderr
+    entry = approval_ledger.load(acct["name"])[REL]
+    assert entry["state"] == "approved" and entry["approved_sha"] != old_sha
+
+
+def test_first_approval_has_no_replaces_line(tmp_path, isolated_account_factory):
+    pair, _acct = _setup(tmp_path, isolated_account_factory)
+    first = run_thth(["approve", str(Path(pair["work"]) / REL)])
+    assert "差し替わります" not in first.stdout and "承認済みです" not in first.stdout

thth-4.5.3/tests/test_v453_bookmark_gate.py

@@ -0,0 +1,123 @@
+"""4.5.3 の柵: はてなブックマークの CLI の `--production` も口座の台帳の `require_gate: true` に従う
+（計画 4.4.3 の伺い 2・本線と合意。4.4.1 では gate の範囲の外だった）。
+
+- add・edit・batch の 2 段目: 番号が無いか形が違えば、打つ前（HTTP も順番待ちも無し）に断る。
+- 正しい番号なら通り、まとめて承認ではまとめのファイルに番号を残す。
+- `require_gate` の無い口座は今までどおり番号なしで通る（既存の試験が見ている）。
+"""
+from __future__ import annotations
+
+import json
+
+import pytest
+
+from tests.hatena_s1_flow_helpers import call
+from tests.hatena_s4_helpers import ACCOUNT, EXTERNAL, bm, calls, fake_http, world  # noqa: F401
+from tests.test_v410_bookmark_batch import bb, item, write  # noqa: F401
+from thth import bookmark_batch
+
+
+def _require_gate(world):
+    data = world.account(ACCOUNT)
+    data["require_gate"] = True
+    world.write_account(data)
+
+
+def _add_stage1(extra=()):
+    rc, out, err = call(["bookmark", "add", ACCOUNT, "--url", EXTERNAL, "--comment", "c", "--json", *extra])
+    assert rc == 1, (out, err)
+    return json.loads(out)["digest"]
+
+
+def _add_stage2(digest, extra=()):
+    return call(["bookmark", "add", ACCOUNT, "--url", EXTERNAL, "--comment", "c", "--confirm", digest,
+                 "--by", "tester", "--production", "--json", *extra])
+
+
+@pytest.mark.parametrize("extra, code", [((), "approval_gate_required"),
+                                         (("--approval", "A2610-25"), "approval_invalid")])
+def test_add_refuses_without_gate_before_any_http(bm, extra, code):
+    _require_gate(bm)
+    digest = _add_stage1()
+    before = len(calls(bm, "POST"))
+    rc, out, err = _add_stage2(digest, extra)
+    assert rc == 1, (out, err)
+    assert json.loads(out)["error"] == code
+    assert len(calls(bm, "POST")) == before
+
+
+def test_add_with_gate_goes_through(bm):
+    _require_gate(bm)
+    digest = _add_stage1()
+    rc, out, err = _add_stage2(digest, ("--approval", "A261023-7"))
+    assert rc == 0, (out, err)
+    assert json.loads(out)["approval"] == "A261023-7"
+
+
+def test_first_stage_hint_names_approval(bm):
+    _require_gate(bm)
+    rc, out, err = call(["bookmark", "add", ACCOUNT, "--url", EXTERNAL, "--comment", "c"])
+    assert rc == 1
+    assert "--approval <番号>" in out
+
+
+def test_edit_refuses_without_gate(bm):
+    _require_gate(bm)
+    rc, out, err = _add_stage2(_add_stage1(), ("--approval", "A261023-7"))
+    assert rc == 0, (out, err)
+    edit = ["bookmark", "edit", ACCOUNT, "--url", EXTERNAL, "--comment", "d", "--json"]
+    rc, out, err = call(edit)
+    assert rc == 1, (out, err)
+    digest = json.loads(out)["digest"]
+    before = len(calls(bm, "POST"))
+    rc, out, err = call(edit + ["--confirm", digest, "--by", "tester", "--production"])
+    assert rc == 1 and json.loads(out)["error"] == "approval_gate_required", (out, err)
+    assert len(calls(bm, "POST")) == before
+    rc, out, err = call(edit + ["--confirm", digest, "--by", "tester", "--production", "--approval", "A261023-9"])
+    assert rc == 0, (out, err)
+
+
+def test_batch_refuses_without_gate_and_records_gate(bb):  # noqa: F811
+    _require_gate(bb)
+    path = write(bb, [item("https://a.example.com/page/1")])
+    rc, out, err = call(["bookmark", "batch", ACCOUNT, path, "--json"])
+    digest = json.loads(out)["digest"]
+    rc, out, err = call(["bookmark", "batch", ACCOUNT, path, "--confirm", digest, "--by", "masaru",
+                         "--production", "--json"])
+    assert rc == 1 and json.loads(out)["error"] == "approval_gate_required", (out, err)
+    assert bookmark_batch.load_batches(ACCOUNT) == []
+    rc, out, err = call(["bookmark", "batch", ACCOUNT, path, "--confirm", digest, "--by", "masaru",
+                         "--production", "--approval", "A261023-8", "--json"])
+    assert rc == 0, (out, err)
+    [batch] = bookmark_batch.load_batches(ACCOUNT)
+    assert batch["approval"] == "A261023-8"
+
+
+def test_batch_without_require_gate_needs_no_number(bb):  # noqa: F811
+    path = write(bb, [item("https://a.example.com/page/1")])
+    rc, out, err = call(["bookmark", "batch", ACCOUNT, path, "--json"])
+    digest = json.loads(out)["digest"]
+    rc, out, err = call(["bookmark", "batch", ACCOUNT, path, "--confirm", digest, "--by", "masaru",
+                         "--production", "--json"])
+    assert rc == 0, (out, err)
+    [batch] = bookmark_batch.load_batches(ACCOUNT)
+    assert "approval" not in batch
+
+
+# 監査（Fable 10/23）: MCP の bookmark_request・bookmark_batch_request も approval を受け、
+# 遠くの CLI に --approval を組む（無いと require_gate: true の口座で MCP からは必ず断られる）。
+def test_mcp_bookmark_tools_accept_and_forward_approval():
+    import os
+    import sys as _sys
+    _sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "mcp"))
+    import server
+    tools = {t["name"]: t for t in server.SERVER_TOOLS}
+    for name in ("thth_bookmark_request", "thth_bookmark_batch_request"):
+        assert "approval" in tools[name]["inputSchema"]["properties"], name
+    add_argv = server.REMOTE_CLI["thth_bookmark_request"][0]({"account": "alpha", "url": EXTERNAL,
+                                                               "approval": "A261021-25"})
+    batch_argv = server.REMOTE_CLI["thth_bookmark_batch_request"][0]({"account": "alpha", "text": "",
+                                                                      "approval": "A261021-25"})
+    assert "--approval=A261021-25" in add_argv and "--approval=A261021-25" in batch_argv
+    assert not any(a.startswith("--approval") for a in
+                   server.REMOTE_CLI["thth_bookmark_request"][0]({"account": "alpha", "url": EXTERNAL}))

thth-4.5.3/thth/VERSION

@@ -0,0 +1 @@
+4.5.3

{thth-4.5.2 → thth-4.5.3}/thth/bookmark_batch.py

@@ -561,8 +561,13 @@ def lines(p: dict) -> list:
 # 2 段目（§20.5・口座のロックの中で呼ぶ）
 # --------------------------------------------------------------------------
 
-def approve_locked(account_name: str, cfg: dict, p: dict, *, actor, via, credential=None, now=None) -> dict:
-    """1 段目の材料 `p`（ロックの中で作り直したもの）を順番待ちに置く。"""
+def approve_locked(account_name: str, cfg: dict, p: dict, *, actor, via, credential=None, now=None,
+                   approval=None) -> dict:
+    """1 段目の材料 `p`（ロックの中で作り直したもの）を順番待ちに置く。
+
+    `approval`（4.5.3）: hub の承認の番号（CLI の `--approval`）。あればまとめのファイルに残す
+    （無ければ鍵ごと書かない——4.5.2 までのまとめと同じ形）。
+    """
     from . import guard, principals
     if not p["included"]:
         raise BatchError("batch_empty")
@@ -598,6 +603,8 @@ def approve_locked(account_name: str, cfg: dict, p: dict, *, actor, via, credent
              "excluded": [{"n": r["n"], "line": r["line"], "url": r.get("url"), "reason": r["reason"],
                            "detail": r.get("detail")} for r in p["items"] if not r["include"]],
              "items": items}
+    if approval:
+        batch["approval"] = approval
     _save_batch(account_name, batch)
     try:
         from . import admin_log
@@ -607,7 +614,7 @@ def approve_locked(account_name: str, cfg: dict, p: dict, *, actor, via, credent
         pass
     return {"account": account_name, "status": "queued", "batch": batch["batch"], "digest": batch["digest"],
             "queued": len(items), "excluded": len(batch["excluded"]), "expires_at": batch["expires_at"],
-            "approved_by": actor}
+            "approved_by": actor, **({"approval": approval} if approval else {})}
 
 
 def cancel_locked(account_name: str, batch_id: str, *, by, item=None, now=None) -> dict: