Skip to content

Commit ffed32c

Browse files
ToolboxAidToolboxAid
committed
Close template convergence, normalize Theme V2, and eliminate remaining legacy surfaces - PR_26154_026-028-cleanup-stack
1 parent aee14fd commit ffed32c

18 files changed

Lines changed: 340 additions & 63 deletions

File tree

‎admin/controls.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<body>
1414
<div data-partial="header-nav"></div>
1515
<main>
16-
<section class="controls-hero">
16+
<section class="page-title controls-hero">
1717
<div class="container controls-hero-grid">
1818
<div>
1919
<div class="kicker">Admin control forge</div>

‎assets/theme/v2/css/theme.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@import url("../fonts/fontawesome/css/font-awesome.min.css");
12
@import url("colors.css");
23
@import url("spacing.css");
34
@import url("typography.css");

‎company/about.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<body>
1414
<div data-partial="header-nav"></div>
1515
<main>
16-
<section class="about-hero">
16+
<section class="page-title about-hero">
1717
<div class="container about-hero__content">
1818
<div class="kicker">About Game Foundry Studio</div>
1919
<h1>Build, play and share open-web games without writing code.</h1>

‎docs_build/dev/codex_commands.md‎

Lines changed: 46 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,68 @@
22

33
Task:
44

5-
- `PR_26154_025-cloud-template-styles-cleanup`
5+
- `PR_26154_026-template-convergence-closeout`
6+
- `PR_26154_027-theme-v2-final-normalization`
7+
- `PR_26154_028-legacy-surface-elimination`
68

79
Commands run:
810

911
- `Get-Content .codex/skills/repo-build/SKILL.md`
1012
- `Get-Content docs_build/dev/PROJECT_INSTRUCTIONS.md`
1113
- `git status --short`
14+
- `git log -4 --oneline`
15+
- Re-ran public/root and active toolbox template consistency audits.
1216
- Inspected:
13-
- `toolbox/cloud/index.html`
17+
- `_page_template_v2.html`
1418
- `toolbox/_tool_template-v2/index.html`
15-
- `assets/theme/v2/css/styles.css`
1619
- `assets/theme/v2/css/theme.css`
17-
- `assets/theme/v2/css/spacing.css`
18-
- `assets/theme/v2/css/colors.css`
19-
- `assets/theme/v2/css/layout.css`
20-
- `assets/theme/v2/css/panels.css`
21-
- `assets/theme/v2/css/accordion.css`
22-
- active `styles.css` consumers
23-
- Normalized `toolbox/cloud/index.html` to the active tool template structure with ToolDisplayMode host, tool workspace shell, left/center/right panels, and shared `tool-display-mode.js`.
24-
- Promoted reusable page/tool shell selectors needed by active pages into approved Theme V2 CSS modules.
25-
- Replaced or removed active `styles.css` references so active pages/templates/tools consume `theme.css`.
26-
- Reran targeted Cloud/style/theme reference checks.
27-
- Reran the template consistency audit and recorded before/after mismatch counts.
28-
- Ran CSS import validation for changed Theme V2 CSS modules.
20+
- `assets/theme/v2/css/styles.css`
21+
- `assets/theme/v2/js/gamefoundry-partials.js`
22+
- `assets/theme/v2/js/tool-display-mode.js`
23+
- `assets/theme/v2/partials/header-nav.html`
24+
- `assets/theme/v2/partials/footer.html`
25+
- active toolbox pages with `data-tool-display-mode`
26+
- `tests/theme.test.js`
27+
- `tests/run-tests.mjs`
28+
- `scripts/`
29+
- Added missing `page-title` template markers to `admin/controls.html` and `company/about.html`.
30+
- Added explicit ToolDisplayMode data attributes to active toolbox pages that were falling back to generic `index.png` assets.
31+
- Wired existing Font Awesome CSS through `assets/theme/v2/css/theme.css`.
32+
- Deleted obsolete `tests/theme.test.js` and removed its aggregate runner import.
33+
- Audited `assets/theme/v2` CSS, fonts, images, JS, and partials.
34+
- Audited `toolbox/` and `scripts/` legacy candidates.
35+
- Ran targeted reference checks for:
36+
- `_page_template_v2.html`
37+
- `toolbox/_tool_template-v2`
38+
- `theme.css`
39+
- `styles.css`
40+
- `assets/theme/v2`
41+
- `toolbox`
42+
- `scripts`
43+
- `tests`
44+
- Ran static validation for changed HTML, CSS, JS/MJS, and Markdown files.
2945
- Ran `npm run test:workspace-v2`.
30-
- Restored generated Workspace V2 validation cache/report side effects that were not part of this PR's required report set.
31-
- Restored compact `.tool-column-header h2/h3` sizing to `var(--font-size-base)` after active pages moved off `styles.css`.
32-
- Ran static validation for changed HTML, CSS, JSON, JavaScript, and Markdown files.
46+
- Restored generated Workspace V2 validation side-effect reports that were not part of this PR's required artifact set.
3347
- Ran `git diff --check`.
3448
- Ran `npm run codex:review-artifacts`.
3549
- Packaged repo-structured ZIP:
36-
- `tmp/PR_26154_025-cloud-template-styles-cleanup_delta.zip`
50+
- `tmp/PR_26154_026-028-template-theme-legacy-closeout_delta.zip`
3751

3852
Validation summary:
3953

40-
- PASS targeted Cloud/template/style checks.
54+
- PASS template consistency audit: public/root pages `43/43`, active toolbox pages `20/20`.
55+
- PASS all active toolbox ToolDisplayMode hosts have `data-tool-slug`.
56+
- PASS explicit ToolDisplayMode image sources resolve with page base rules.
4157
- PASS zero active references to `assets/theme/v2/css/styles.css`.
42-
- PASS Theme V2 CSS import validation.
43-
- PASS compact tool column header sizing restored to the previous `16px` value through `var(--font-size-base)`.
44-
- PASS template consistency audit rerun: public/root pages improved from 28/43 matching to 41/43 matching; active toolbox pages improved from 19/20 matching to 20/20 matching.
45-
- PASS `npm run test:workspace-v2`.
46-
- PASS static validation for changed HTML, CSS, JSON, JavaScript, and Markdown files.
58+
- PASS zero active references to `assets/theme/v2/css/theme/v2`.
59+
- PASS zero active references to `assets/theme/v2/assets`.
60+
- PASS zero active references to `assets/theme/v1`.
61+
- PASS zero active references to `favicon.ico`.
62+
- PASS Theme V2 CSS imports resolve, including Font Awesome.
63+
- PASS changed HTML files have no inline script/style/event handler additions.
64+
- PASS `node --check tests/run-tests.mjs`.
65+
- PASS `npm run test:workspace-v2` (`2 passed`).
4766
- PASS `git diff --check`.
48-
- SKIPPED tests against `old-tools/`, `old_games/`, and `old_samples` per request.
67+
- PASS `npm run codex:review-artifacts`.
68+
- SKIPPED tests against `old-tools/`, `old_games/`, and `old_samples/` per request.
4969
- SKIPPED full samples smoke test per request.

‎docs_build/dev/commit_comment.txt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
Normalize Cloud template and remove active styles.css usage - PR_26154_025-cloud-template-styles-cleanup
1+
Close template, Theme V2, and legacy cleanup gaps - PR_26154_026-028-template-theme-legacy-closeout
22

3-
- Rebuild `toolbox/cloud/index.html` as an active tool-template page with ToolDisplayMode, tool workspace shell, and left/center/right panels.
4-
- Promote reusable page hero, accordion stack, semantic color, and public tool shell styling into approved Theme V2 CSS modules.
5-
- Restore compact tool column header text sizing after moving active pages off the aggregate stylesheet.
6-
- Remove active `styles.css` references from public/root pages, active toolbox pages, the active tool template, and the rebuilt Localization template.
7-
- Leave deprecated-only `styles.css` references documented while confirming zero active consumers remain.
8-
- Validate Cloud wiring, Theme V2 CSS imports, template consistency counts, Workspace V2 launch/navigation behavior, static paths, and diff hygiene.
3+
- Close remaining public/root template markers and active toolbox ToolDisplayMode data attributes.
4+
- Wire Font Awesome through the active Theme V2 entry point.
5+
- Remove obsolete V1 theme test coverage that imports deleted `src/engine/theme` files.
6+
- Report remaining Theme V2 unwired assets, ambiguous toolbox legacy surfaces, and stale test candidates.
7+
- Validate template counts, active path references, static changed files, Workspace V2, diff hygiene, and review artifacts.

‎docs_build/dev/reports/legacy_surface_elimination_report.md‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# PR_26154_028 Legacy Surface Elimination
2+
3+
Baseline used: `PR_26154_025-cloud-template-styles-cleanup`.
4+
5+
## Scope
6+
7+
- Reviewed active `toolbox/` for legacy remnants.
8+
- Reviewed `scripts/` for legacy/V1 remnants.
9+
- Removed only a confirmed obsolete test surface.
10+
- Reported ambiguous legacy candidates instead of moving or deleting active support files.
11+
12+
## Removed
13+
14+
- Deleted `tests/theme.test.js`.
15+
- Removed the bare `./theme.test.js` import from `tests/run-tests.mjs`.
16+
17+
Reason: `tests/theme.test.js` imported `src/engine/theme/Theme.js` and `src/engine/theme/ThemeTokens.js`, but `src/engine/theme/` no longer exists in the working tree. The test represented obsolete V1/engine-theme coverage and was only retained through the aggregate node test runner import.
18+
19+
## Kept
20+
21+
The following files remain because active references or ambiguous ownership still exist:
22+
23+
- `toolbox/toolRegistry.js`: legacy-heavy registry with many `old-tools/` entries, but still imported by `toolbox/shared/toolLaunchSSoTData.js` and tests.
24+
- `toolbox/renderToolsIndex.js`: not used by the current `toolbox/index.html`, but still referenced by docs/tests and depends on `toolbox/toolRegistry.js`.
25+
- `toolbox/shared/`: still imported by active tests and shared tool-support modules.
26+
- `toolbox/dev/`: still wired from root package scripts such as `pretest` and guard commands.
27+
- `scripts/run-targeted-test-lanes.mjs`: active package script dependency.
28+
- `scripts/run-node-tests.mjs`: active package script dependency.
29+
- `scripts/validate-*.mjs`: validation/support scripts remain active or ambiguous.
30+
- PowerShell scripts under `scripts/PS/`: left untouched because no script was proven deprecated-only in this PR.
31+
32+
## Stale Or Legacy Test Candidates
33+
34+
Reported, not removed:
35+
36+
- `tests/playwright/tools/ToolTemplateV2Baseline.spec.mjs`: still asserts retired `src/engine/theme` and old `tool-starter__*` template details. It is part of the broader `tool-runtime` lane and needs a dedicated active-template test alignment PR.
37+
- `tests/runtime/V2ToolSmoke.test.mjs`: still checks old `toolbox/*-v2` directory conventions and old shared theme imports. It is not part of the current `workspace-contract` lane and needs a dedicated runtime smoke test ownership decision.
38+
- `tests/playwright/tools/WorkspaceManagerV2.spec.mjs`: contains historical string assertions for `src/engine/theme` references. Those assertions were not in the targeted `workspace-contract` lane for this stack.
39+
- `tests/validation/samples.shared.boundaries.report.json`: generated/historical report still contains `/src/engine/theme/index.js`; left untouched as report data.
40+
41+
## Scripts Audit
42+
43+
No scripts were deleted. The tracked scripts under `scripts/` are either wired through `package.json`, validation workflows, deployment helpers, or ambiguous historical utilities. Untracked personal files under `scripts/untracked/` were not modified.
44+
45+
## Active Vs Legacy Inventory
46+
47+
Active:
48+
49+
- Active public/root pages.
50+
- Active `toolbox/[toolname]/index.html` pages.
51+
- `assets/theme/v2/css/theme.css`.
52+
- `assets/theme/v2/js/gamefoundry-partials.js`.
53+
- `assets/theme/v2/js/tool-display-mode.js`.
54+
- `assets/theme/v2/partials/header-nav.html`.
55+
- `assets/theme/v2/partials/footer.html`.
56+
- `scripts/run-targeted-test-lanes.mjs`.
57+
- `scripts/run-node-tests.mjs`.
58+
59+
Legacy or deprecated:
60+
61+
- `old-tools/`.
62+
- `old_games/`.
63+
- `old_samples/`.
64+
- Deprecated-only references to `assets/theme/v2/css/styles.css`.
65+
- Historical docs/reports mentioning `src/engine/theme`.
66+
67+
Ambiguous cleanup candidates:
68+
69+
- `toolbox/toolRegistry.js`.
70+
- `toolbox/renderToolsIndex.js`.
71+
- `toolbox/shared/preview/`.
72+
- `toolbox/shared/samples/`.
73+
- `tests/playwright/tools/ToolTemplateV2Baseline.spec.mjs`.
74+
- `tests/runtime/V2ToolSmoke.test.mjs`.

‎docs_build/dev/reports/remaining_mismatches_report.md‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# PR_26154_026-028 Remaining Mismatches
2+
3+
## Template Mismatches
4+
5+
Current audit result:
6+
7+
- Public/root pages: 43 total, 43 matching, 0 mismatches.
8+
- Active toolbox pages: 20 total, 20 matching, 0 mismatches.
9+
10+
No remaining template-critical mismatches were found for:
11+
12+
- `_page_template_v2.html` public/root page checks.
13+
- `toolbox/_tool_template-v2` active toolbox checks.
14+
- `theme.css` entry wiring.
15+
- `ToolDisplayMode` host presence.
16+
- `ToolDisplayMode` slug attributes.
17+
- `tool-workspace` shell presence.
18+
- left/center/right panel markers.
19+
20+
## Remaining Non-Blocking Findings
21+
22+
- `assets/theme/v2/partials/page-shell.html` and `assets/theme/v2/partials/tool-shell.html` are present but not actively consumed by `gamefoundry-partials.js`.
23+
- `assets/theme/v2/css/styles.css` has zero active consumers but remains referenced by deprecated/report surfaces.
24+
- Several Theme V2 images are directly unreferenced; see `theme_v2_final_normalization_report.md`.
25+
- Some tests still contain historical `src/engine/theme` assertions; see `legacy_surface_elimination_report.md`.
26+
27+
## Exclusions
28+
29+
The audit intentionally excludes:
30+
31+
- `old-tools/`.
32+
- `old_games/`.
33+
- `old_samples/`.
34+
- `start_of_day/`.
35+
- Generated reports.
36+
- The template source files themselves when counting active pages.

‎docs_build/dev/reports/template_convergence_closeout_report.md‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# PR_26154_026 Template Convergence Closeout
2+
3+
Baseline used: `PR_26154_025-cloud-template-styles-cleanup`.
4+
5+
## Scope
6+
7+
- Re-ran the public/root page audit against `_page_template_v2.html`.
8+
- Re-ran the active toolbox page audit against `toolbox/_tool_template-v2`.
9+
- Fixed only clear template contract gaps.
10+
11+
## Before Counts
12+
13+
Input source: `docs_build/dev/reports/template_consistency_before_after_report.md` from PR_26154_025.
14+
15+
| Surface | Total | Matching | Mismatches |
16+
| --- | ---: | ---: | ---: |
17+
| Public/root pages | 43 | 41 | 2 |
18+
| Active toolbox pages | 20 | 20 | 0 |
19+
20+
## Fixes Applied
21+
22+
- `admin/controls.html`: added the `page-title` template marker to the existing `controls-hero` section.
23+
- `company/about.html`: added the `page-title` template marker to the existing `about-hero` section.
24+
- `toolbox/builder/index.html`: added explicit ToolDisplayMode data attributes.
25+
- `toolbox/configuration-admin/index.html`: added explicit ToolDisplayMode data attributes.
26+
- `toolbox/creator/index.html`: added explicit ToolDisplayMode data attributes.
27+
- `toolbox/game-builder/index.html`: added explicit ToolDisplayMode data attributes.
28+
- `toolbox/game-design/index.html`: added explicit ToolDisplayMode data attributes.
29+
- `toolbox/publish/index.html`: added explicit ToolDisplayMode data attributes.
30+
- `toolbox/world-vector/index.html`: added explicit ToolDisplayMode data attributes.
31+
32+
No page body content was rewritten. No left/center/right column layout was changed.
33+
34+
## After Counts
35+
36+
| Surface | Total | Matching | Mismatches |
37+
| --- | ---: | ---: | ---: |
38+
| Public/root pages | 43 | 43 | 0 |
39+
| Active toolbox pages | 20 | 20 | 0 |
40+
41+
## Contract Checks
42+
43+
Public/root checks:
44+
45+
- Theme V2 `theme.css` entry wiring.
46+
- No active `styles.css` aggregate wiring.
47+
- `page-title` marker on non-home public/root pages.
48+
49+
Active toolbox checks:
50+
51+
- Theme V2 `theme.css` entry wiring.
52+
- `data-tool-display-mode`.
53+
- `data-tool-slug`.
54+
- `tool-display-mode.js`.
55+
- `tool-workspace`.
56+
- left/right `tool-column` markers.
57+
- `tool-center-panel`.
58+
59+
## Validation Notes
60+
61+
- Full samples smoke test skipped by request.
62+
- Tests against `old-tools/`, `old_games/`, and `old_samples/` skipped by request.
63+
- `npm run test:workspace-v2` is required for this stack because active toolbox display-mode wiring changed.

0 commit comments

Comments
 (0)