diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md
index 8991bf38..60a13f29 100644
--- a/docs/modernization/debt.md
+++ b/docs/modernization/debt.md
@@ -18,6 +18,12 @@ agent or engineer to remove them without reconstructing context from chat.
 
 ## Recent Reductions
 
+- 2026-06-15: `DEBT-0038` was narrowed again. The retained cloud publish
+  prompt setup in `show_cloud_publish_prompt()` now routes through a focused
+  helper in `src/legacy_cloud_services.cpp` instead of living inline in the
+  retained prompt/setup body; the remaining cloud bridge debt stays
+  concentrated in retained prompt/progress lifetime, OpenGL context guarding,
+  and the still-retained transfer-thread execution model.
 - 2026-06-15: `DEBT-0038` was narrowed again. The retained cloud publish
   detached-thread launch in `show_cloud_publish_prompt()` now routes through a
   focused helper in `src/legacy_cloud_services.cpp` instead of living inline
diff --git a/docs/modernization/roadmap.md b/docs/modernization/roadmap.md
index 9f51bca2..72fc8838 100644
--- a/docs/modernization/roadmap.md
+++ b/docs/modernization/roadmap.md
@@ -212,6 +212,11 @@ The retained cloud publish detached-thread launch in
 `src/legacy_cloud_services.cpp`, so the remaining cloud bridge debt is
 further concentrated on retained prompt/progress lifetime, OpenGL context
 guarding, and the still-retained transfer-thread execution model.
+The retained cloud publish prompt setup in
+`show_cloud_publish_prompt()` now also routes through a focused helper in
+`src/legacy_cloud_services.cpp`, so the remaining cloud bridge debt is
+further concentrated on retained prompt/progress lifetime, OpenGL context
+guarding, and the still-retained transfer-thread execution model.
 
 Recent 2026-06-13 retained preview reductions continue to narrow DEBT-0036:
 `NodeStrokePreview::draw_stroke_immediate()` now also routes
diff --git a/docs/modernization/tasks.md b/docs/modernization/tasks.md
index 77acdf2a..51610221 100644
--- a/docs/modernization/tasks.md
+++ b/docs/modernization/tasks.md
@@ -1270,6 +1270,39 @@ Completed Task Log:
 | Date | Task | Score | Validation | Commit |
 | --- | --- | ---: | --- | --- |
 | 2026-06-15 | ADP-033 | no score movement | `powershell -ExecutionPolicy Bypass -File scripts\\automation\\quiet-validate.ps1 -BuildTargets pano_cli -TestRegex "pp_app_core_document_cloud"` | `9e731b4a` |
+
+### ADP-034 - Extract Cloud Publish Prompt Setup Helper
+
+Status: Done
+Score: no score movement
+Debt: `DEBT-0038`
+Scope: `src/legacy_cloud_services.cpp` only
+
+Goal:
+
+Reduce the inline retained cloud publish prompt setup surface by extracting
+the prompt plan/dialog/button wiring from `show_cloud_publish_prompt()` into a
+focused helper while preserving current behavior.
+
+Done Checks:
+
+- The retained cloud publish prompt setup no longer lives inline in
+  `show_cloud_publish_prompt()`.
+- The retained cloud publish prompt setup now routes through a focused helper
+  in `src/legacy_cloud_services.cpp`.
+- `DEBT-0038` and the roadmap note the reduced remaining cloud bridge
+  surface.
+
+Validation:
+
+```powershell
+powershell -ExecutionPolicy Bypass -File scripts\automation\quiet-validate.ps1 -BuildTargets pano_cli -TestRegex "pp_app_core_document_cloud"
+```
+
+Completed Task Log:
+
+| Date | Task | Score | Validation | Commit |
+| --- | --- | ---: | --- | --- |
 | 2026-06-15 | ADP-007 | +1 legacy adapter retirement | `ctest --preset desktop-fast --build-config Debug -R "pp_app_core_app_dialog\|pp_ui_core_node_lifetime\|pp_ui_core_overlay_lifetime" --output-on-failure`; `ctest --preset desktop-fast --build-config Debug -R "pp_app_core_main_toolbar" --output-on-failure`; `MSBuild.exe out\build\windows-msvc-default\tests\pp_app_core_main_toolbar_tests.vcxproj /p:Configuration=Debug /p:Platform=x64`; `MSBuild.exe out\build\windows-msvc-default\panopainter_app.vcxproj /p:Configuration=Debug /p:Platform=x64` | `8db859cb` |
 
 ### RND-001 - Make Pure Equirectangular Export The Primary Success Path
diff --git a/src/legacy_cloud_services.cpp b/src/legacy_cloud_services.cpp
index 72be263b..aae0d062 100644
--- a/src/legacy_cloud_services.cpp
+++ b/src/legacy_cloud_services.cpp
@@ -268,7 +268,7 @@ void wire_cloud_publish_prompt_buttons(
     };
 }
 
-void show_cloud_publish_prompt(App& app, bool save_before_upload)
+void setup_cloud_publish_prompt(App& app, bool save_before_upload)
 {
     const auto prompt_plan = pp::app::plan_cloud_publish_prompt();
     auto dialog = app.message_box(prompt_plan.title, prompt_plan.message, prompt_plan.show_cancel);
@@ -277,6 +277,11 @@ void show_cloud_publish_prompt(App& app, bool save_before_upload)
     });
 }
 
+void show_cloud_publish_prompt(App& app, bool save_before_upload)
+{
+    setup_cloud_publish_prompt(app, save_before_upload);
+}
+
 std::shared_ptr<NodeProgressBar> create_cloud_bulk_upload_progress(
     App& app,
     int progress_total)