From 3e02b1a08dee892a377a20f04eb005db73e044f1 Mon Sep 17 00:00:00 2001
From: 128na <simutrans.128na@gmail.com>
Date: Mon, 22 Jun 2026 23:12:21 +0900
Subject: [PATCH 1/3] Close remaining known-risks gaps (A2, D4, and SPOF test
 coverage)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Two items needed a behavior decision and got one:
- A2: FetchHtml now calls Http::get()->throw(), treating any non-2xx
  response the same as a connection failure — neither writes to
  RawPage nor gets cached. Previously only connection exceptions were
  caught; a 404/500 response body would silently get written/cached.
- D4: extracted Page update and Pak sync into UpdateOrCreatePageWithPaks,
  wrapping both in DB::transaction() so a SyncPak failure can no longer
  leave a Page with new title/text but stale pak associations visible
  to search. All three site Handlers now use this combined action.

B3 (Notion re-sync throttling) stays unimplemented per decision —
recorded in the ledger only, revisit if API quota becomes a problem.

The rest is closing out every remaining SPOF row (single test) to OK
(2+ tests) per the ledger's own correction conditions: A1/A3, B1/B2,
C1/C2, D1/D3. Notably C1 had no direct web-route (non-JSON) test, and
B2's null-URL delete guard and delete-side fault isolation had no test
at all despite being implemented in the prior PR.

known-risks.md updated to 🟢 OK across the board except B3 (still
🔴 Missing, by decision) and D2 (N/A, no draft/publish concept exists).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 app/Actions/Extract/Japan/Handler.php         |  13 +-
 app/Actions/Extract/Portal/Handler.php        |  11 +-
 app/Actions/Extract/Twitrans/Handler.php      |  13 +-
 .../Extract/UpdateOrCreatePageWithPaks.php    |  38 ++++++
 app/Actions/Scrape/FetchHtml.php              |   3 +-
 docs/known-risks.md                           |  20 +--
 .../Extract/Japan/HandlerIsolationTest.php    |   4 +-
 .../Extract/UpdateOrCreatePageTest.php        |  14 +++
 .../UpdateOrCreatePageWithPaksTest.php        |  47 +++++++
 .../Feature/Actions/Scrape/FetchHtmlTest.php  |  19 +++
 .../Scrape/Japan/HandlerFailureTest.php       |  24 ++++
 .../Scrape/Japan/HandlerIsolationTest.php     |  50 ++++++++
 .../Actions/SearchPage/FeedActionTest.php     |  30 +++++
 .../Actions/SyncNotion/SyncActionTest.php     | 119 ++++++++++++++++++
 tests/Feature/Http/ApiErrorResponseTest.php   |  23 ++++
 .../Http/Resources/PageResourceTest.php       |  19 +++
 tests/Feature/Http/WebErrorResponseTest.php   |  34 +++++
 17 files changed, 445 insertions(+), 36 deletions(-)
 create mode 100644 app/Actions/Extract/UpdateOrCreatePageWithPaks.php
 create mode 100644 tests/Feature/Actions/Extract/UpdateOrCreatePageWithPaksTest.php
 create mode 100644 tests/Feature/Actions/Scrape/Japan/HandlerIsolationTest.php
 create mode 100644 tests/Feature/Actions/SearchPage/FeedActionTest.php
 create mode 100644 tests/Feature/Http/WebErrorResponseTest.php

diff --git a/app/Actions/Extract/Japan/Handler.php b/app/Actions/Extract/Japan/Handler.php
index 2d0ce0c..010b39d 100644
--- a/app/Actions/Extract/Japan/Handler.php
+++ b/app/Actions/Extract/Japan/Handler.php
@@ -7,8 +7,7 @@
 use App\Actions\Extract\ChunkRawPages;
 use App\Actions\Extract\HandlerInterface;
 use App\Actions\Extract\MarkExtractFailed;
-use App\Actions\Extract\SyncPak;
-use App\Actions\Extract\UpdateOrCreatePage;
+use App\Actions\Extract\UpdateOrCreatePageWithPaks;
 use App\Enums\SiteName;
 use App\Models\Page;
 use App\Models\RawPage;
@@ -22,8 +21,7 @@ public function __construct(
         private ChunkRawPages $chunkRawPages,
         private ExtractLastModified $extractLastModified,
         private ExtractContents $extractContents,
-        private UpdateOrCreatePage $updateOrCreatePage,
-        private SyncPak $syncPak,
+        private UpdateOrCreatePageWithPaks $updateOrCreatePageWithPaks,
         private MarkExtractFailed $markExtractFailed,
     ) {}
 
@@ -42,14 +40,13 @@ public function __invoke(LoggerInterface $logger): void
                     // pageがあって更新有り
                     if (! $rawPage->page || $this->needUpdate($rawPage->page, $lastModiefied)) {
                         $contents = ($this->extractContents)($rawPage);
-                        $page = ($this->updateOrCreatePage)(
+                        ($this->updateOrCreatePageWithPaks)(
                             $rawPage,
                             $contents['title'],
                             $contents['text'],
-                            $lastModiefied
+                            $lastModiefied,
+                            $contents['paks']
                         );
-
-                        ($this->syncPak)($page, $contents['paks']);
                     }
 
                     $this->markExtractFailed->clear($rawPage);
diff --git a/app/Actions/Extract/Portal/Handler.php b/app/Actions/Extract/Portal/Handler.php
index e7a1dd4..8d57ef4 100644
--- a/app/Actions/Extract/Portal/Handler.php
+++ b/app/Actions/Extract/Portal/Handler.php
@@ -7,8 +7,7 @@
 use App\Actions\Extract\ChunkRawPages;
 use App\Actions\Extract\HandlerInterface;
 use App\Actions\Extract\MarkExtractFailed;
-use App\Actions\Extract\SyncPak;
-use App\Actions\Extract\UpdateOrCreatePage;
+use App\Actions\Extract\UpdateOrCreatePageWithPaks;
 use App\Enums\SiteName;
 use App\Models\Page;
 use App\Models\RawPage;
@@ -22,8 +21,7 @@ public function __construct(
         private ChunkRawPages $chunkRawPages,
         private FindArticle $findArticle,
         private ExtractContents $extractContents,
-        private UpdateOrCreatePage $updateOrCreatePage,
-        private SyncPak $syncPak,
+        private UpdateOrCreatePageWithPaks $updateOrCreatePageWithPaks,
         private MarkExtractFailed $markExtractFailed,
     ) {}
 
@@ -44,14 +42,13 @@ public function __invoke(LoggerInterface $logger): void
                     // pageがあって更新有り
                     if (! $rawPage->page || $this->needUpdate($rawPage->page, $lastModiefied)) {
                         $contents = ($this->extractContents)($article);
-                        $page = ($this->updateOrCreatePage)(
+                        ($this->updateOrCreatePageWithPaks)(
                             $rawPage,
                             $contents['title'],
                             $contents['text'],
                             $lastModiefied,
+                            $contents['paks']
                         );
-
-                        ($this->syncPak)($page, $contents['paks']);
                     }
 
                     $this->markExtractFailed->clear($rawPage);
diff --git a/app/Actions/Extract/Twitrans/Handler.php b/app/Actions/Extract/Twitrans/Handler.php
index 2ee7ebc..b9eda98 100644
--- a/app/Actions/Extract/Twitrans/Handler.php
+++ b/app/Actions/Extract/Twitrans/Handler.php
@@ -7,8 +7,7 @@
 use App\Actions\Extract\ChunkRawPages;
 use App\Actions\Extract\HandlerInterface;
 use App\Actions\Extract\MarkExtractFailed;
-use App\Actions\Extract\SyncPak;
-use App\Actions\Extract\UpdateOrCreatePage;
+use App\Actions\Extract\UpdateOrCreatePageWithPaks;
 use App\Enums\SiteName;
 use App\Models\Page;
 use App\Models\RawPage;
@@ -22,8 +21,7 @@ public function __construct(
         private ChunkRawPages $chunkRawPages,
         private ExtractLastModified $extractLastModified,
         private ExtractContents $extractContents,
-        private UpdateOrCreatePage $updateOrCreatePage,
-        private SyncPak $syncPak,
+        private UpdateOrCreatePageWithPaks $updateOrCreatePageWithPaks,
         private MarkExtractFailed $markExtractFailed,
     ) {}
 
@@ -42,14 +40,13 @@ public function __invoke(LoggerInterface $logger): void
                     // pageがあって更新有り
                     if (! $rawPage->page || $this->needUpdate($rawPage->page, $lastModiefied)) {
                         $contents = ($this->extractContents)($rawPage);
-                        $page = ($this->updateOrCreatePage)(
+                        ($this->updateOrCreatePageWithPaks)(
                             $rawPage,
                             $contents['title'],
                             $contents['text'],
-                            $lastModiefied
+                            $lastModiefied,
+                            $contents['paks']
                         );
-
-                        ($this->syncPak)($page, $contents['paks']);
                     }
 
                     $this->markExtractFailed->clear($rawPage);
diff --git a/app/Actions/Extract/UpdateOrCreatePageWithPaks.php b/app/Actions/Extract/UpdateOrCreatePageWithPaks.php
new file mode 100644
index 0000000..68e3e66
--- /dev/null
+++ b/app/Actions/Extract/UpdateOrCreatePageWithPaks.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Extract;
+
+use App\Enums\PakSlug;
+use App\Models\Page;
+use App\Models\RawPage;
+use Carbon\CarbonImmutable;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * Page の更新と Pak の同期を 1 トランザクションで行う。
+ *
+ * 別々に呼ぶと SyncPak が失敗した際に「title/text は新しいが Pak 紐付けは古いまま」の
+ * 半端な Page が検索/Feed に見えてしまう（D4: 抽出の原子性）。
+ */
+final readonly class UpdateOrCreatePageWithPaks
+{
+    public function __construct(
+        private UpdateOrCreatePage $updateOrCreatePage,
+        private SyncPak $syncPak,
+    ) {}
+
+    /**
+     * @param  array<int,PakSlug>  $paks
+     */
+    public function __invoke(RawPage $rawPage, string $title, string $text, CarbonImmutable $lastModified, array $paks): Page
+    {
+        return DB::transaction(function () use ($rawPage, $title, $text, $lastModified, $paks): Page {
+            $page = ($this->updateOrCreatePage)($rawPage, $title, $text, $lastModified);
+            ($this->syncPak)($page, $paks);
+
+            return $page;
+        });
+    }
+}
diff --git a/app/Actions/Scrape/FetchHtml.php b/app/Actions/Scrape/FetchHtml.php
index 8f254a8..0a812fa 100644
--- a/app/Actions/Scrape/FetchHtml.php
+++ b/app/Actions/Scrape/FetchHtml.php
@@ -25,7 +25,8 @@ public function __invoke(string $url, Encoding $fromEncoding): Crawler
             /** @var string */
             $html = Cache::get($key);
         } else {
-            $result = retry($this->retryTimes, fn () => Http::get($url), $this->sleepMilliseconds);
+            // 非2xx も失敗として扱い、RawPage にエラーページの内容を書き込まないようにする。
+            $result = retry($this->retryTimes, fn () => Http::get($url)->throw(), $this->sleepMilliseconds);
             $html = $fromEncoding === Encoding::UTF_8
                 ? $result->body()
                 : mb_convert_encoding((string) $result->body(), Encoding::UTF_8->value, $fromEncoding->value);
diff --git a/docs/known-risks.md b/docs/known-risks.md
index 6561680..2ed5f8d 100644
--- a/docs/known-risks.md
+++ b/docs/known-risks.md
@@ -12,9 +12,9 @@
 
 | ID | 保護すべき挙動 / Expected Outcome | 制御 | テスト | Status | 是正条件 | 記録日 |
 |----|----------------------------------|------|--------|--------|----------|--------|
-| A1 | 1 サイト/1URL の失敗で他サイト・他 URL の処理が止まらない | Preventive（ハンドラ毎の try/catch） | 1（`Extract/Japan/HandlerIsolationTest`） | 🟡 SPOF | テストを 2 本以上に（scrape 側 / 他サイトにも展開） | 2026-06-22 |
-| A2 | HTTP 失敗時に RawPage を空/部分 HTML で上書きしない | Preventive（fetch 例外時は upsert に到達しない） | 1（`Scrape/Japan/HandlerFailureTest`） | 🟡 SPOF | 残課題: 非2xx でも body を書き込む経路がある。`->throw()` 等で非2xx も失敗扱いにするか検討 | 2026-06-22 |
-| A3 | 同一 RawPage に extract を再実行しても Page 重複が出ない（冪等） | Preventive（`pages_url_unique` + HasOne） | 1（`Extract/UpdateOrCreatePageTest`） | 🟡 SPOF | テストを 2 本以上に | 2026-06-22 |
+| A1 | 1 サイト/1URL の失敗で他サイト・他 URL の処理が止まらない | Preventive（ハンドラ毎の try/catch） | 2（`Extract/Japan/HandlerIsolationTest` + `Scrape/Japan/HandlerIsolationTest`） | 🟢 OK | — | 2026-06-22 |
+| A2 | HTTP 失敗時に RawPage を空/部分 HTML で上書きしない | Preventive（`FetchHtml` で `Http::get()->throw()`。非2xx も例外として扱い `retry()` 経由で失敗、upsert に到達しない） | 3（`FetchHtmlTest::test_throws_on_non_2xx...` + `Scrape/Japan/HandlerFailureTest`×2） | 🟢 OK | — | 2026-06-22 |
+| A3 | 同一 RawPage に extract を再実行しても Page 重複が出ない（冪等） | Preventive（`pages_url_unique` + HasOne） | 2（`Extract/UpdateOrCreatePageTest`） | 🟢 OK | — | 2026-06-22 |
 | A4 | 抽出失敗時にスクレイプ済データ（RawPage）を破壊しない | Preventive（`MarkExtractFailed`：削除せず `extract_failed_at` で隔離、成功時にクリア。`extract_failed_at` に index 追加済み） | 4（`MarkExtractFailedTest`×3 + `HandlerIsolationTest`） | 🟢 OK | — | 2026-06-22 |
 | A5 | 同一 URL の重複行を作らない | Preventive（DB 一意制約） | 2（`Models/UrlUniqueConstraintTest`） | 🟢 OK | — | 2026-06-22 |
 
@@ -22,8 +22,8 @@
 
 | ID | 保護すべき挙動 / Expected Outcome | 制御 | テスト | Status | 是正条件 | 記録日 |
 |----|----------------------------------|------|--------|--------|----------|--------|
-| B1 | 再実行で Notion ページを重複作成しない | Preventive（URL 突合で create/update 分岐） | 1（Strong） | 🟡 SPOF | テストを 2 本以上に増やす | 2026-06-22 |
-| B2 | 1 件の Notion API エラーでバッチ全体が止まらない | Preventive（delete/add 両方とも項目単位 try/catch + 継続 + 失敗件数を error ログ。`addNewNotionPages` は `keyNotionPagesByUrl()` で URL 解析失敗も個別隔離。URL が無い Notion ページは削除対象から除外） | 1（`SyncActionTest::test_continues_syncing_when_one_item_fails`） | 🟡 SPOF | テストを 2 本以上に（delete 側の失敗継続・null URL ガードの直接テストを追加） | 2026-06-22 |
+| B1 | 再実行で Notion ページを重複作成しない | Preventive（URL 突合で create/update 分岐） | 2（`test_sync_action_creates_updates_and_deletes_pages` + `test_does_not_create_duplicate_when_page_already_exists_in_notion`） | 🟢 OK | — | 2026-06-22 |
+| B2 | 1 件の Notion API エラーでバッチ全体が止まらない | Preventive（delete/add 両方とも項目単位 try/catch + 継続 + 失敗件数を error ログ。`addNewNotionPages` は `keyNotionPagesByUrl()` で URL 解析失敗も個別隔離。URL が無い Notion ページは削除対象から除外） | 3（`test_continues_syncing_when_one_item_fails` + `test_continues_deleting_when_one_delete_fails` + `test_does_not_delete_notion_page_without_url`） | 🟢 OK | — | 2026-06-22 |
 | B3 | 未変更項目を毎回 re-PUSH せず API クォータを浪費しない | None（`synced_at`/状態フラグ無し） | 0 | 🔴 Missing | **記録のみ**。API 呼び出し回数が問題化したら `synced_at` を導入 | 2026-06-22 |
 | B4 | Notion シークレットを例外/ログ/Discord に流出させない | Preventive（`SecretScrubber` で送出前に伏字化。C3 と一体） | 7（C3 のテストと共有） | 🟢 OK | — | 2026-06-22 |
 
@@ -31,8 +31,8 @@
 
 | ID | 保護すべき挙動 / Expected Outcome | 制御 | テスト | Status | 是正条件 | 記録日 |
 |----|----------------------------------|------|--------|--------|----------|--------|
-| C1 | デバッグページが config/スタックトレースを露出しない | Preventive（`.env.example`/`.ci`/`.deploy` すべて `APP_DEBUG=false`、コード既定も false） | 1（C2 の `ApiErrorResponseTest` で間接担保） | 🟡 SPOF | Web 側デバッグページ向けの直接テストは未追加 | 2026-06-22 |
-| C2 | API 例外が生のトレースを返さない | Preventive（`APP_DEBUG=false` で汎用 JSON エラー） | 1（`Http/ApiErrorResponseTest`） | 🟡 SPOF | テストを 2 本以上に | 2026-06-22 |
+| C1 | デバッグページが config/スタックトレースを露出しない | Preventive（`.env.example`/`.ci`/`.deploy` すべて `APP_DEBUG=false`、コード既定も false） | 2（`Http/ApiErrorResponseTest` + `Http/WebErrorResponseTest`） | 🟢 OK | — | 2026-06-22 |
+| C2 | API 例外が生のトレースを返さない | Preventive（`APP_DEBUG=false` で汎用 JSON エラー） | 2（`Http/ApiErrorResponseTest`×2） | 🟢 OK | — | 2026-06-22 |
 | C3 | 例外レポート（log/Discord）に機密値を混入させない | Preventive（`SecretScrubber`（伏字化対象は5文字以上の値のみ。"root"等の短い開発用パスワードでの誤爆を回避）+ `RedactSecretsProcessor`/tap + `ConvertDiscord`（親クラスの `addMessageStacktrace` を no-op 化し、未伏字化の生トレースでの上書きも防止） で送出前に伏字化） | 7（`SecretScrubberTest`×4 + `RedactSecretsProcessorTest` + `ConvertDiscordTest`×2） | 🟢 OK | — | 2026-06-22 |
 | C4 | 実シークレットを git に混入させない | Preventive（`.gitignore` で `.env` 除外、committed な `.env.*` は空値） | N/A | 🟢 OK | — | 2026-06-22 |
 
@@ -40,10 +40,10 @@
 
 | ID | 保護すべき挙動 / Expected Outcome | 制御 | テスト | Status | 是正条件 | 記録日 |
 |----|----------------------------------|------|--------|--------|----------|--------|
-| D1 | raw_pages（生 HTML）を公開経路に露出しない | Preventive（検索/Feed で rawPage を eager-load しない、Page に html 列無し） | 1（`PageResourceTest::test_search_does_not_eager_load_raw_page_relation`） | 🟡 SPOF | Feed 経路の assert も追加 | 2026-06-22 |
+| D1 | raw_pages（生 HTML）を公開経路に露出しない | Preventive（検索/Feed で rawPage を eager-load しない、Page に html 列無し） | 2（`PageResourceTest::test_search_does_not_eager_load_raw_page_relation` + `SearchPage/FeedActionTest`） | 🟢 OK | — | 2026-06-22 |
 | D2 | 非公開コンテンツを検索/Feed に出さない | N/A（Page に公開状態の概念が無い） | — | — | 対象外（将来 status 列を足す場合は再評価） | 2026-06-22 |
-| D3 | API/Feed 応答に内部フィールドを含めない | Preventive（PageResource 許可リスト） | 1（`PageResourceTest::test_resource_exposes_only_whitelisted_fields`） | 🟡 SPOF | テストを 2 本以上に | 2026-06-22 |
-| D4 | 半分書かれた Page 行を検索に見せない（原子性） | None（`UpdateOrCreatePage` に transaction 無し） | 0 | 🟡 Structural Weakness | （低優先・データ品質）将来 transaction か status 列で是正 | 2026-06-22 |
+| D3 | API/Feed 応答に内部フィールドを含めない | Preventive（PageResource 許可リスト + `Page::toFeedItem()`） | 2（`PageResourceTest::test_resource_exposes_only_whitelisted_fields` + `test_feed_item_does_not_expose_internal_fields_or_raw_html`） | 🟢 OK | — | 2026-06-22 |
+| D4 | 半分書かれた Page 行を検索に見せない（原子性） | Preventive（`UpdateOrCreatePageWithPaks` が Page 更新 + Pak 同期を `DB::transaction()` で原子化。3 Handler すべてこれを使用） | 2（`Extract/UpdateOrCreatePageWithPaksTest`） | 🟢 OK | — | 2026-06-22 |
 
 <!--
 運用メモ:
diff --git a/tests/Feature/Actions/Extract/Japan/HandlerIsolationTest.php b/tests/Feature/Actions/Extract/Japan/HandlerIsolationTest.php
index fe9cd6d..d51c833 100644
--- a/tests/Feature/Actions/Extract/Japan/HandlerIsolationTest.php
+++ b/tests/Feature/Actions/Extract/Japan/HandlerIsolationTest.php
@@ -11,6 +11,7 @@
 use App\Actions\Extract\MarkExtractFailed;
 use App\Actions\Extract\SyncPak;
 use App\Actions\Extract\UpdateOrCreatePage;
+use App\Actions\Extract\UpdateOrCreatePageWithPaks;
 use App\Enums\SiteName;
 use App\Models\RawPage;
 use Psr\Log\NullLogger;
@@ -43,8 +44,7 @@ public function test_failure_on_one_raw_page_does_not_stop_the_others(): void
             new ChunkRawPages,
             new ExtractLastModified,
             new ExtractContents,
-            new UpdateOrCreatePage,
-            new SyncPak,
+            new UpdateOrCreatePageWithPaks(new UpdateOrCreatePage, new SyncPak),
             new MarkExtractFailed,
         );
 
diff --git a/tests/Feature/Actions/Extract/UpdateOrCreatePageTest.php b/tests/Feature/Actions/Extract/UpdateOrCreatePageTest.php
index 1ebf1aa..2d60b6b 100644
--- a/tests/Feature/Actions/Extract/UpdateOrCreatePageTest.php
+++ b/tests/Feature/Actions/Extract/UpdateOrCreatePageTest.php
@@ -28,4 +28,18 @@ public function test_running_twice_keeps_a_single_page(): void
         $this->assertSame($page->id, $second->id);
         $this->assertSame('タイトル更新', $second->fresh()?->title);
     }
+
+    public function test_running_three_times_from_separate_instances_keeps_a_single_page(): void
+    {
+        $rawPage = RawPage::factory()->create();
+
+        // 同一インスタンスの再利用に依存していないことを確認するため、毎回新しいインスタンスで実行する
+        // （別プロセス/別ジョブ実行からの再実行を模す）。
+        (new UpdateOrCreatePage)($rawPage, '1回目', '本文1', CarbonImmutable::now());
+        (new UpdateOrCreatePage)($rawPage->fresh(), '2回目', '本文2', CarbonImmutable::now());
+        $third = (new UpdateOrCreatePage)($rawPage->fresh(), '3回目', '本文3', CarbonImmutable::now());
+
+        $this->assertSame(1, Page::query()->where('raw_page_id', $rawPage->id)->count());
+        $this->assertSame('3回目', $third->fresh()?->title);
+    }
 }
diff --git a/tests/Feature/Actions/Extract/UpdateOrCreatePageWithPaksTest.php b/tests/Feature/Actions/Extract/UpdateOrCreatePageWithPaksTest.php
new file mode 100644
index 0000000..2be0e85
--- /dev/null
+++ b/tests/Feature/Actions/Extract/UpdateOrCreatePageWithPaksTest.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Feature\Actions\Extract;
+
+use App\Actions\Extract\SyncPak;
+use App\Actions\Extract\UpdateOrCreatePage;
+use App\Actions\Extract\UpdateOrCreatePageWithPaks;
+use App\Models\RawPage;
+use Carbon\CarbonImmutable;
+use Illuminate\Support\Facades\DB;
+use Tests\Feature\TestCase;
+
+/**
+ * D4: Page の更新と Pak 同期は 1 トランザクションで行われ、片方だけ反映された
+ * 半端な状態（title/text は新しいが Pak 紐付けは古いまま）が検索に見えないこと。
+ */
+final class UpdateOrCreatePageWithPaksTest extends TestCase
+{
+    public function test_wraps_page_update_and_pak_sync_in_a_single_transaction(): void
+    {
+        $rawPage = RawPage::factory()->create();
+
+        // SyncPak は final のため Mockery では型ヒント越しに差し替えできない。
+        // 代わりに DB::transaction が実際に呼ばれていること（両操作が原子的にまとめられていること）
+        // を直接検証する。
+        DB::shouldReceive('transaction')
+            ->once()
+            ->andReturnUsing(fn (\Closure $callback) => $callback());
+
+        $updateOrCreatePageWithPaks = new UpdateOrCreatePageWithPaks(new UpdateOrCreatePage, new SyncPak);
+        $page = $updateOrCreatePageWithPaks($rawPage, '新タイトル', '新本文', CarbonImmutable::now(), []);
+
+        $this->assertSame('新タイトル', $page->title);
+    }
+
+    public function test_commits_page_and_paks_together_on_success(): void
+    {
+        $rawPage = RawPage::factory()->create();
+
+        $updateOrCreatePageWithPaks = new UpdateOrCreatePageWithPaks(new UpdateOrCreatePage, new SyncPak);
+        $page = $updateOrCreatePageWithPaks($rawPage, '新タイトル', '新本文', CarbonImmutable::now(), []);
+
+        $this->assertSame('新タイトル', $page->fresh()?->title);
+    }
+}
diff --git a/tests/Feature/Actions/Scrape/FetchHtmlTest.php b/tests/Feature/Actions/Scrape/FetchHtmlTest.php
index 04b3f61..ae4db89 100644
--- a/tests/Feature/Actions/Scrape/FetchHtmlTest.php
+++ b/tests/Feature/Actions/Scrape/FetchHtmlTest.php
@@ -6,6 +6,7 @@
 
 use App\Actions\Scrape\FetchHtml;
 use App\Enums\Encoding;
+use Illuminate\Http\Client\RequestException;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
 use Symfony\Component\DomCrawler\Crawler;
@@ -59,6 +60,24 @@ public function test_uses_cache_when_enabled(): void
         Http::assertNothingSent();
     }
 
+    public function test_throws_on_non_2xx_response_instead_of_returning_error_body(): void
+    {
+        $url = 'https://example.com/not-found';
+
+        Http::fake([
+            $url => Http::response('<html><body>404 Not Found</body></html>', 404),
+        ]);
+
+        $fetchHtml = new FetchHtml(
+            retryTimes: 1,
+            sleepMilliseconds: 1,
+            useCache: false
+        );
+
+        $this->expectException(RequestException::class);
+        $fetchHtml($url, Encoding::UTF_8);
+    }
+
     public function test_converts_encoding(): void
     {
         $url = 'https://example.com/euc-jp';
diff --git a/tests/Feature/Actions/Scrape/Japan/HandlerFailureTest.php b/tests/Feature/Actions/Scrape/Japan/HandlerFailureTest.php
index 2b6ec5f..789c447 100644
--- a/tests/Feature/Actions/Scrape/Japan/HandlerFailureTest.php
+++ b/tests/Feature/Actions/Scrape/Japan/HandlerFailureTest.php
@@ -45,4 +45,28 @@ public function test_does_not_write_raw_page_when_fetch_fails(): void
 
         $this->assertSame(0, RawPage::query()->count());
     }
+
+    public function test_does_not_write_raw_page_when_response_is_non_2xx(): void
+    {
+        Http::preventStrayRequests();
+
+        $listHtml = '<html><body><div id="body"><ul><li>'
+            .'<a href="https://japanese.simutrans.com:443/index.php?Addon128%2FTest">test</a>'
+            .'</li></ul></div></body></html>';
+
+        Http::fake([
+            'https://japanese.simutrans.com?cmd=list' => Http::response($listHtml, 200),
+            'https://japanese.simutrans.com/index.php?Addon128%2FTest' => Http::response('<html><body>error page</body></html>', 500),
+        ]);
+
+        $handler = new Handler(
+            new FetchHtml(retryTimes: 1, sleepMilliseconds: 1, useCache: false),
+            new FindUrls(new FetchHtml(retryTimes: 1, sleepMilliseconds: 1, useCache: false)),
+            new UpdateOrCreateRawPage,
+        );
+
+        $handler(new NullLogger);
+
+        $this->assertSame(0, RawPage::query()->count());
+    }
 }
diff --git a/tests/Feature/Actions/Scrape/Japan/HandlerIsolationTest.php b/tests/Feature/Actions/Scrape/Japan/HandlerIsolationTest.php
new file mode 100644
index 0000000..a87c4b5
--- /dev/null
+++ b/tests/Feature/Actions/Scrape/Japan/HandlerIsolationTest.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Feature\Actions\Scrape\Japan;
+
+use App\Actions\Scrape\FetchHtml;
+use App\Actions\Scrape\Japan\FindUrls;
+use App\Actions\Scrape\Japan\Handler;
+use App\Actions\Scrape\UpdateOrCreateRawPage;
+use App\Models\RawPage;
+use Illuminate\Http\Client\ConnectionException;
+use Illuminate\Support\Facades\Http;
+use Psr\Log\NullLogger;
+use Tests\Feature\TestCase;
+
+/**
+ * A1: 1 URL の失敗で他の URL の処理が止まらないこと（scrape 側）。
+ */
+final class HandlerIsolationTest extends TestCase
+{
+    public function test_failure_on_one_url_does_not_stop_the_others(): void
+    {
+        Http::preventStrayRequests();
+
+        $listHtml = '<html><body><div id="body"><ul>'
+            .'<li><a href="https://japanese.simutrans.com:443/index.php?Addon128%2FBroken">broken</a></li>'
+            .'<li><a href="https://japanese.simutrans.com:443/index.php?Addon128%2FOk">ok</a></li>'
+            .'</ul></div></body></html>';
+
+        Http::fake([
+            'https://japanese.simutrans.com?cmd=list' => Http::response($listHtml, 200),
+            'https://japanese.simutrans.com/index.php?Addon128%2FBroken' => fn (): never => throw new ConnectionException('connection failed'),
+            'https://japanese.simutrans.com/index.php?Addon128%2FOk' => Http::response('<html><body>ok</body></html>', 200),
+        ]);
+
+        $handler = new Handler(
+            new FetchHtml(retryTimes: 1, sleepMilliseconds: 1, useCache: false),
+            new FindUrls(new FetchHtml(retryTimes: 1, sleepMilliseconds: 1, useCache: false)),
+            new UpdateOrCreateRawPage,
+        );
+
+        $handler(new NullLogger);
+
+        // 失敗した URL は書き込まれず、成功した URL は書き込まれること。
+        $this->assertSame(1, RawPage::query()->count());
+        $this->assertDatabaseHas('raw_pages', ['url' => 'https://japanese.simutrans.com:443/index.php?Addon128%2FOk']);
+        $this->assertDatabaseMissing('raw_pages', ['url' => 'https://japanese.simutrans.com:443/index.php?Addon128%2FBroken']);
+    }
+}
diff --git a/tests/Feature/Actions/SearchPage/FeedActionTest.php b/tests/Feature/Actions/SearchPage/FeedActionTest.php
new file mode 100644
index 0000000..11727a5
--- /dev/null
+++ b/tests/Feature/Actions/SearchPage/FeedActionTest.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Feature\Actions\SearchPage;
+
+use App\Actions\SearchPage\FeedAction;
+use App\Enums\SiteName;
+use App\Models\Page;
+use Tests\Feature\TestCase;
+
+/**
+ * D1: Feed 経路でも raw_pages（生 HTML）を露出しない。
+ */
+final class FeedActionTest extends TestCase
+{
+    public function test_get_does_not_eager_load_raw_page_relation(): void
+    {
+        Page::factory()->create([
+            'site_name' => SiteName::Japan,
+            'title' => 'Addon',
+            'text' => 'body',
+        ]);
+
+        $pages = (new FeedAction)->get();
+
+        $this->assertCount(1, $pages);
+        $this->assertFalse($pages->first()?->relationLoaded('rawPage'));
+    }
+}
diff --git a/tests/Feature/Actions/SyncNotion/SyncActionTest.php b/tests/Feature/Actions/SyncNotion/SyncActionTest.php
index 7b05d25..c0d7ae2 100644
--- a/tests/Feature/Actions/SyncNotion/SyncActionTest.php
+++ b/tests/Feature/Actions/SyncNotion/SyncActionTest.php
@@ -94,6 +94,54 @@ public function test_sync_action_creates_updates_and_deletes_pages(): void
         $syncAction('test_database_id', 10);
     }
 
+    /**
+     * B1: 既に Notion 側に同じ URL のページが存在する場合、再実行で重複作成しない。
+     */
+    public function test_does_not_create_duplicate_when_page_already_exists_in_notion(): void
+    {
+        Page::factory()->create([
+            'title' => 'Already Synced',
+            'site_name' => SiteName::Japan,
+            'url' => 'https://example.com/already-synced',
+            'last_modified' => now(),
+        ]);
+
+        $database = Database::fromArray([
+            'id' => 'test_database_id',
+            'created_time' => '2023-01-01T00:00:00.000Z',
+            'last_edited_time' => '2023-01-01T00:00:00.000Z',
+            'title' => [],
+            'description' => [],
+            'icon' => null,
+            'cover' => null,
+            'properties' => [
+                'Title' => ['id' => 'title', 'type' => 'title', 'name' => 'Title', 'title' => []],
+                'パックセット' => [
+                    'id' => 'prop_id',
+                    'type' => 'multi_select',
+                    'name' => 'パックセット',
+                    'multi_select' => ['options' => []],
+                ],
+            ],
+            'parent' => ['type' => 'workspace', 'workspace' => true],
+            'url' => 'https://notion.so',
+            'is_inline' => false,
+        ]);
+
+        $existingNotionPage = NotionPage::create(PageParent::database('test_database_id'));
+        $existingNotionPage = $existingNotionPage->addProperty('URL', Url::create('https://example.com/already-synced'));
+
+        $mock = Mockery::mock(Notion::class);
+        $mock->shouldReceive('databases->find')->with('test_database_id')->andReturn($database);
+        $mock->shouldReceive('databases->queryAllPages')->with($database)->andReturn([$existingNotionPage]);
+
+        $mock->shouldReceive('pages->create')->never();
+        $mock->shouldReceive('pages->update')->once();
+
+        $syncAction = new SyncAction($mock);
+        $syncAction('test_database_id', 10);
+    }
+
     /**
      * B2: 1 件の Notion API エラーでバッチ全体が止まらず、残り項目が処理されること。
      */
@@ -153,4 +201,75 @@ public function test_continues_syncing_when_one_item_fails(): void
         // バッチ全体が中断せず正常終了すること（例外が伝播しない）。
         $syncAction('test_database_id', 10);
     }
+
+    /**
+     * B2: delete 側でも 1 件の Notion API エラーでバッチ全体が止まらないこと。
+     */
+    public function test_continues_deleting_when_one_delete_fails(): void
+    {
+        $database = $this->minimalDatabase();
+
+        $notionPageFails = NotionPage::create(PageParent::database('test_database_id'));
+        $notionPageFails = $notionPageFails->addProperty('URL', Url::create('https://example.com/delete-fails'));
+
+        $notionPageSucceeds = NotionPage::create(PageParent::database('test_database_id'));
+        $notionPageSucceeds = $notionPageSucceeds->addProperty('URL', Url::create('https://example.com/delete-ok'));
+
+        $mock = Mockery::mock(Notion::class);
+        $mock->shouldReceive('databases->find')->with('test_database_id')->andReturn($database);
+        $mock->shouldReceive('databases->queryAllPages')->with($database)->andReturn([$notionPageFails, $notionPageSucceeds]);
+
+        $mock->shouldReceive('pages->delete')->once()->with($notionPageFails)->andThrow(new \RuntimeException('rate limited'));
+        $mock->shouldReceive('pages->delete')->once()->with($notionPageSucceeds);
+
+        $syncAction = new SyncAction($mock);
+
+        // バッチ全体が中断せず、残りの削除も実行されること（例外が伝播しない）。
+        $syncAction('test_database_id', 10);
+    }
+
+    /**
+     * B2: URL が無い Notion ページ（手動作成の下書き等）は削除対象から除外する。
+     */
+    public function test_does_not_delete_notion_page_without_url(): void
+    {
+        $database = $this->minimalDatabase();
+
+        $notionPageWithoutUrl = NotionPage::create(PageParent::database('test_database_id'));
+        $notionPageWithoutUrl = $notionPageWithoutUrl->addProperty('URL', Url::createEmpty());
+
+        $mock = Mockery::mock(Notion::class);
+        $mock->shouldReceive('databases->find')->with('test_database_id')->andReturn($database);
+        $mock->shouldReceive('databases->queryAllPages')->with($database)->andReturn([$notionPageWithoutUrl]);
+
+        $mock->shouldReceive('pages->delete')->never();
+
+        $syncAction = new SyncAction($mock);
+        $syncAction('test_database_id', 10);
+    }
+
+    private function minimalDatabase(): Database
+    {
+        return Database::fromArray([
+            'id' => 'test_database_id',
+            'created_time' => '2023-01-01T00:00:00.000Z',
+            'last_edited_time' => '2023-01-01T00:00:00.000Z',
+            'title' => [],
+            'description' => [],
+            'icon' => null,
+            'cover' => null,
+            'properties' => [
+                'Title' => ['id' => 'title', 'type' => 'title', 'name' => 'Title', 'title' => []],
+                'パックセット' => [
+                    'id' => 'prop_id',
+                    'type' => 'multi_select',
+                    'name' => 'パックセット',
+                    'multi_select' => ['options' => []],
+                ],
+            ],
+            'parent' => ['type' => 'workspace', 'workspace' => true],
+            'url' => 'https://notion.so',
+            'is_inline' => false,
+        ]);
+    }
 }
diff --git a/tests/Feature/Http/ApiErrorResponseTest.php b/tests/Feature/Http/ApiErrorResponseTest.php
index be0168c..4766d10 100644
--- a/tests/Feature/Http/ApiErrorResponseTest.php
+++ b/tests/Feature/Http/ApiErrorResponseTest.php
@@ -31,4 +31,27 @@ public function test_exception_response_does_not_leak_trace_in_production_mode()
         $this->assertSame('Server Error', $testResponse->json('message'));
         $this->assertStringNotContainsString('super-secret-detail-xyz', $testResponse->getContent() ?: '');
     }
+
+    /**
+     * 例外メッセージに実際の機密値（DB 接続情報）が含まれているケースでも
+     * 本番モードでは API 応答に出ないこと。
+     */
+    public function test_api_response_does_not_leak_secret_embedded_in_exception_message(): void
+    {
+        Config::set('app.debug', false);
+        Config::set('database.connections.mysql.password', 'super-db-password');
+
+        Route::get('/__test/throw-with-secret', function (): never {
+            $password = Config::string('database.connections.mysql.password');
+            throw new \RuntimeException('connection refused for password='.$password);
+        });
+
+        $testResponse = $this->getJson('/__test/throw-with-secret');
+
+        $testResponse->assertStatus(500);
+        $testResponse->assertJsonMissingPath('trace');
+        $testResponse->assertJsonMissingPath('exception');
+        $this->assertSame('Server Error', $testResponse->json('message'));
+        $this->assertStringNotContainsString('super-db-password', $testResponse->getContent() ?: '');
+    }
 }
diff --git a/tests/Feature/Http/Resources/PageResourceTest.php b/tests/Feature/Http/Resources/PageResourceTest.php
index 78b9abc..689b515 100644
--- a/tests/Feature/Http/Resources/PageResourceTest.php
+++ b/tests/Feature/Http/Resources/PageResourceTest.php
@@ -57,4 +57,23 @@ public function test_search_does_not_eager_load_raw_page_relation(): void
         // 生 HTML を持つ rawPage リレーションがロードされていないこと。
         $this->assertFalse($result->items()[0]->relationLoaded('rawPage'));
     }
+
+    /**
+     * D3: RSS Feed（Page::toFeedItem）も内部フィールド・生 HTML を含めないこと。
+     */
+    public function test_feed_item_does_not_expose_internal_fields_or_raw_html(): void
+    {
+        $rawPage = RawPage::factory()->create(['html' => '<html>secret-internal-html</html>']);
+        $page = Page::factory()->create([
+            'raw_page_id' => $rawPage->id,
+            'site_name' => SiteName::Japan,
+            'title' => 'Addon Title',
+            'text' => 'Addon body text',
+        ]);
+
+        $feedItem = $page->toFeedItem();
+        $encoded = (string) json_encode($feedItem);
+
+        $this->assertStringNotContainsString('secret-internal-html', $encoded);
+    }
 }
diff --git a/tests/Feature/Http/WebErrorResponseTest.php b/tests/Feature/Http/WebErrorResponseTest.php
new file mode 100644
index 0000000..1c25525
--- /dev/null
+++ b/tests/Feature/Http/WebErrorResponseTest.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Feature\Http;
+
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Route;
+use Tests\Feature\TestCase;
+
+/**
+ * C1: デバッグページ（Web/HTML 経路）が本番モードで config やスタックトレースを露出しないこと。
+ */
+final class WebErrorResponseTest extends TestCase
+{
+    public function test_web_response_does_not_leak_trace_in_production_mode(): void
+    {
+        Config::set('app.debug', false);
+
+        Route::get('/__test/throw-web', function (): never {
+            throw new \RuntimeException('super-secret-detail-xyz');
+        });
+
+        $testResponse = $this->get('/__test/throw-web');
+
+        $testResponse->assertStatus(500);
+
+        $content = $testResponse->getContent() ?: '';
+
+        $this->assertStringNotContainsString('super-secret-detail-xyz', $content);
+        // Whoops/デバッグページ特有のマーカーが出ていないこと（trace の代わりに汎用エラーページが返る）。
+        $this->assertStringNotContainsString('Stack trace', $content);
+    }
+}

From 525d64169c0f758d56037c7cca27b24ef1c2b049 Mon Sep 17 00:00:00 2001
From: 128na <simutrans.128na@gmail.com>
Date: Mon, 22 Jun 2026 23:22:07 +0900
Subject: [PATCH 2/3] Fix container-breaking DB mock and avoid retrying
 permanent 4xx errors

- UpdateOrCreatePageWithPaksTest: DB::shouldReceive('transaction')
  replaces the whole database manager in the container, breaking the
  real queries UpdateOrCreatePage/SyncPak issue inside the mocked
  transaction. Switch to DB::partialMock() so only transaction() is
  mocked and everything else still hits the real connection.
- FetchHtml: retry() previously retried on any throwable, including
  4xx client errors that retrying can never fix (404/403 won't
  resolve on attempt 2). Added a $when callback so only connection
  exceptions and 5xx server errors are retried; 4xx fails immediately.
  Added tests asserting the call count for both branches.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 app/Actions/Scrape/FetchHtml.php              |  9 +++-
 docs/known-risks.md                           |  2 +-
 .../UpdateOrCreatePageWithPaksTest.php        |  7 ++-
 .../Feature/Actions/Scrape/FetchHtmlTest.php  | 48 +++++++++++++++++++
 4 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/app/Actions/Scrape/FetchHtml.php b/app/Actions/Scrape/FetchHtml.php
index 0a812fa..4387d7b 100644
--- a/app/Actions/Scrape/FetchHtml.php
+++ b/app/Actions/Scrape/FetchHtml.php
@@ -5,6 +5,7 @@
 namespace App\Actions\Scrape;
 
 use App\Enums\Encoding;
+use Illuminate\Http\Client\RequestException;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
 use Symfony\Component\DomCrawler\Crawler;
@@ -26,7 +27,13 @@ public function __invoke(string $url, Encoding $fromEncoding): Crawler
             $html = Cache::get($key);
         } else {
             // 非2xx も失敗として扱い、RawPage にエラーページの内容を書き込まないようにする。
-            $result = retry($this->retryTimes, fn () => Http::get($url)->throw(), $this->sleepMilliseconds);
+            // 4xx は再試行しても解消しないため、接続エラー/5xx のみリトライ対象にする。
+            $result = retry(
+                $this->retryTimes,
+                fn () => Http::get($url)->throw(),
+                $this->sleepMilliseconds,
+                fn (\Throwable $th): bool => ! $th instanceof RequestException || $th->response->serverError(),
+            );
             $html = $fromEncoding === Encoding::UTF_8
                 ? $result->body()
                 : mb_convert_encoding((string) $result->body(), Encoding::UTF_8->value, $fromEncoding->value);
diff --git a/docs/known-risks.md b/docs/known-risks.md
index 2ed5f8d..bcec316 100644
--- a/docs/known-risks.md
+++ b/docs/known-risks.md
@@ -13,7 +13,7 @@
 | ID | 保護すべき挙動 / Expected Outcome | 制御 | テスト | Status | 是正条件 | 記録日 |
 |----|----------------------------------|------|--------|--------|----------|--------|
 | A1 | 1 サイト/1URL の失敗で他サイト・他 URL の処理が止まらない | Preventive（ハンドラ毎の try/catch） | 2（`Extract/Japan/HandlerIsolationTest` + `Scrape/Japan/HandlerIsolationTest`） | 🟢 OK | — | 2026-06-22 |
-| A2 | HTTP 失敗時に RawPage を空/部分 HTML で上書きしない | Preventive（`FetchHtml` で `Http::get()->throw()`。非2xx も例外として扱い `retry()` 経由で失敗、upsert に到達しない） | 3（`FetchHtmlTest::test_throws_on_non_2xx...` + `Scrape/Japan/HandlerFailureTest`×2） | 🟢 OK | — | 2026-06-22 |
+| A2 | HTTP 失敗時に RawPage を空/部分 HTML で上書きしない | Preventive（`FetchHtml` で `Http::get()->throw()`。非2xx も例外として扱い upsert に到達しない。4xx は解消しないため即失敗、5xx/接続エラーのみ `retry()` で再試行） | 5（`FetchHtmlTest::test_throws_on_non_2xx...` + `test_does_not_retry_on_4xx...` + `test_retries_on_5xx...` + `Scrape/Japan/HandlerFailureTest`×2） | 🟢 OK | — | 2026-06-22 |
 | A3 | 同一 RawPage に extract を再実行しても Page 重複が出ない（冪等） | Preventive（`pages_url_unique` + HasOne） | 2（`Extract/UpdateOrCreatePageTest`） | 🟢 OK | — | 2026-06-22 |
 | A4 | 抽出失敗時にスクレイプ済データ（RawPage）を破壊しない | Preventive（`MarkExtractFailed`：削除せず `extract_failed_at` で隔離、成功時にクリア。`extract_failed_at` に index 追加済み） | 4（`MarkExtractFailedTest`×3 + `HandlerIsolationTest`） | 🟢 OK | — | 2026-06-22 |
 | A5 | 同一 URL の重複行を作らない | Preventive（DB 一意制約） | 2（`Models/UrlUniqueConstraintTest`） | 🟢 OK | — | 2026-06-22 |
diff --git a/tests/Feature/Actions/Extract/UpdateOrCreatePageWithPaksTest.php b/tests/Feature/Actions/Extract/UpdateOrCreatePageWithPaksTest.php
index 2be0e85..358e51a 100644
--- a/tests/Feature/Actions/Extract/UpdateOrCreatePageWithPaksTest.php
+++ b/tests/Feature/Actions/Extract/UpdateOrCreatePageWithPaksTest.php
@@ -24,8 +24,11 @@ public function test_wraps_page_update_and_pak_sync_in_a_single_transaction(): v
 
         // SyncPak は final のため Mockery では型ヒント越しに差し替えできない。
         // 代わりに DB::transaction が実際に呼ばれていること（両操作が原子的にまとめられていること）
-        // を直接検証する。
-        DB::shouldReceive('transaction')
+        // を直接検証する。partialMock を使い、transaction 以外の実 DB 操作（UpdateOrCreatePage/SyncPak
+        // 内部のクエリ）はそのまま実行されるようにする（shouldReceive だと DB 全体が差し替わり、
+        // それらのクエリが解決できなくなって壊れる）。
+        DB::partialMock()
+            ->shouldReceive('transaction')
             ->once()
             ->andReturnUsing(fn (\Closure $callback) => $callback());
 
diff --git a/tests/Feature/Actions/Scrape/FetchHtmlTest.php b/tests/Feature/Actions/Scrape/FetchHtmlTest.php
index ae4db89..6fb2abc 100644
--- a/tests/Feature/Actions/Scrape/FetchHtmlTest.php
+++ b/tests/Feature/Actions/Scrape/FetchHtmlTest.php
@@ -78,6 +78,54 @@ public function test_throws_on_non_2xx_response_instead_of_returning_error_body(
         $fetchHtml($url, Encoding::UTF_8);
     }
 
+    public function test_does_not_retry_on_4xx_client_error(): void
+    {
+        $url = 'https://example.com/forbidden';
+
+        Http::fake([
+            $url => Http::response('forbidden', 403),
+        ]);
+
+        $fetchHtml = new FetchHtml(
+            retryTimes: 3,
+            sleepMilliseconds: 1,
+            useCache: false
+        );
+
+        try {
+            $fetchHtml($url, Encoding::UTF_8);
+            $this->fail('exception expected');
+        } catch (RequestException) {
+            // 4xx は解消しないため即失敗し、リトライしない。
+        }
+
+        Http::assertSentCount(1);
+    }
+
+    public function test_retries_on_5xx_server_error(): void
+    {
+        $url = 'https://example.com/server-error';
+
+        Http::fake([
+            $url => Http::response('server error', 500),
+        ]);
+
+        $fetchHtml = new FetchHtml(
+            retryTimes: 3,
+            sleepMilliseconds: 1,
+            useCache: false
+        );
+
+        try {
+            $fetchHtml($url, Encoding::UTF_8);
+            $this->fail('exception expected');
+        } catch (RequestException) {
+            // 5xx は一過性の可能性があるため retryTimes 回まで再試行する。
+        }
+
+        Http::assertSentCount(3);
+    }
+
     public function test_converts_encoding(): void
     {
         $url = 'https://example.com/euc-jp';

From 33b8cd141487508ea9c43c23c0777da42e1fd9dd Mon Sep 17 00:00:00 2001
From: GitHub Action <actions@github.com>
Date: Mon, 22 Jun 2026 14:22:35 +0000
Subject: [PATCH 3/3] [rector] Rector fixes

---
 app/Actions/Scrape/FetchHtml.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Actions/Scrape/FetchHtml.php b/app/Actions/Scrape/FetchHtml.php
index 4387d7b..5eaba0b 100644
--- a/app/Actions/Scrape/FetchHtml.php
+++ b/app/Actions/Scrape/FetchHtml.php
@@ -32,7 +32,7 @@ public function __invoke(string $url, Encoding $fromEncoding): Crawler
                 $this->retryTimes,
                 fn () => Http::get($url)->throw(),
                 $this->sleepMilliseconds,
-                fn (\Throwable $th): bool => ! $th instanceof RequestException || $th->response->serverError(),
+                fn (\Throwable $throwable): bool => ! $throwable instanceof RequestException || $throwable->response->serverError(),
             );
             $html = $fromEncoding === Encoding::UTF_8
                 ? $result->body()