fix(layout): pre-run install of bundled INI before HelloImgui's load_user_pref

The previous followup fix (e9654518, then 2afb0126) only applied the bundled
INI to HelloImgui's runtime state via `imgui.load_ini_settings_from_memory`,
called from the `post_init` callback. That callback fires AFTER HelloImgui
has already:
1. loaded user prefs from disk
2. loaded imgui settings from disk (via imgui.load_ini_settings_from_disk)
3. set up the dockspace tree

By the time post_init fires, HelloImgui has already discarded the empty
on-disk INI's data and built its dock state. The load_ini_settings_from_memory
apply in post_init ended up being SILENTLY DISCARDED for [Docking][Data]
entries with orphaned DockSpace IDs.

Empirical evidence: manual launch test (sloppy.py without --enable-test-hooks)
after 2afb0126 produced a saved manualslop_layout.ini of 3072 bytes with
2 DockNode entries, but those DockNodes were created at RUNTIME, not
loaded from the bundled INI's literal IDs. The imgui core loader rejected
the literal IDs from the bundled INI because the runtime IDs didn't match.

Fix: add `_install_default_layout_pre_run_result` to App.run entry, called
BEFORE `_run_immapp_result`. It writes the bundled INI to cwd if cwd's INI
is missing/empty/small, so when HelloImgui's load_user_pref / load_ini_settings_from_disk
runs, it reads my bundled INI as the initial state. The literal DockSpace
ID 0xAFC85805 (= runtime-generated MainDockSpace 2949142533) matches,
the DockNode IDs 0x00000001/0x00000002 match (because HelloImgui restores
dock IDs from INI), and per-window DockId references apply to the matching
DockNodes.

The post_init live-session apply (imgui.load_ini_settings_from_memory) is
now mostly redundant for first-launch: HelloImgui reads the bundled INI on
its initial load. But it's still there for any edge case where HelloImgui's
load_ini_settings_from_disk reads an INI after the pre-run write somehow
fails, AND it covers the "user manually wiped cwd INI mid-session" case.

Test changes:
- _assert_live_session_apply renamed to _assert_install_applied -- the
  primary path is now pre-run, and the test accepts either
  "[GUI] pre-run installed default layout:" or
  "[GUI] installed default layout: ... (and applied to live session)"
- Updated test 1 and 2 to use the new helper name

Empirical verification (re-run of 18s manual launch):
- Before launch: cwd INI absent
- During launch: [GUI] pre-run installed default layout: ...layouts/default.ini -> ...manualslop_layout.ini
- During launch: [GUI] visible-by-default windows: AI Settings, Diagnostics,
  Discussion Hub, Files & Media, Log Management, Operations Hub, Project
  Settings, Response, Theme
- After force-kill: cwd/manualslop_layout.ini is 3072 bytes containing
  [Docking][Data] with DockSpace ID=0xAFC85805 + DockNode ID=0x00000001
  (CentralNode=1, SizeRef=481,1172) + DockNode ID=0x00000002
  (SizeRef=1197,1172) + 8 [Window][...] entries with DockId=0x00000001,N or
  DockId=0x00000002,N + 0 stale window names
- 17/17 tests pass
This commit is contained in:
ed
2026-06-29 19:52:42 -04:00
parent 2afb0126a5
commit 79c25a329f
2 changed files with 67 additions and 8 deletions
+10 -7
View File
@@ -48,12 +48,15 @@ def _read_launch_log(log_suffix: str) -> str:
return ""
def _assert_live_session_apply(log_suffix: str) -> None:
def _assert_install_applied(log_suffix: str) -> None:
text: str = _read_launch_log(log_suffix)
assert "and applied to live session" in text, (
f"install write succeeded but live-session apply did not happen; "
f"expected the live-apply confirmation line in stderr, got: "
f"{[l for l in text.splitlines() if 'installed' in l]!r}"
install_msgs: list[str] = [l for l in text.splitlines() if "pre-run installed" in l or "applied to live session" in l]
assert install_msgs, (
f"install was not invoked for this run; expected one of "
f"'[GUI] pre-run installed default layout: ...' or "
f"'[GUI] installed default layout: ... (and applied to live session)' "
f"in stderr, got install-related lines: "
f"{[l for l in text.splitlines() if 'default layout' in l]!r}"
)
@@ -185,7 +188,7 @@ def test_default_layout_installed_when_ini_missing(tmp_path: Path) -> None:
proc: subprocess.Popen = _start_subprocess_in(workspace, "ini_missing")
try:
_assert_installed_default(workspace)
_assert_live_session_apply("ini_missing")
_assert_install_applied("ini_missing")
finally:
_terminate(proc)
shutil.rmtree(workspace, ignore_errors=True)
@@ -199,7 +202,7 @@ def test_default_layout_installed_when_ini_empty(tmp_path: Path) -> None:
proc: subprocess.Popen = _start_subprocess_in(workspace, "ini_empty")
try:
_assert_installed_default(workspace)
_assert_live_session_apply("ini_empty")
_assert_install_applied("ini_empty")
finally:
_terminate(proc)
shutil.rmtree(workspace, ignore_errors=True)