Remove navigation mode switching and enforce workspace-only vs tool-only import export flows - PR_11_276

Author: DavidQ

docs/dev/reports/PR_11_276_workspace_v2_nav_mode_and_export_contract_report.md

@@ -1,10 +1,7 @@
-# PR_11_276 Workspace V2 Nav Mode Separation + Workspace Export Contract Report
+# PR_11_276 Workspace V2 Strict Nav Mode Separation + Export Contract Report
 
 ## Scope
-Workspace V2 only:
-- import/export controls
-- tool-vs-workspace nav mode separation
-- workspace export/import contract alignment
+Workspace V2 nav/import/export UI only, plus validation that tool pages do not expose workspace controls.
 
 ## Files Changed
 - tools/workspace-v2/index.html
@@ -15,28 +12,16 @@ Workspace V2 only:
 - docs/dev/reports/PR_11_276_workspace_v2_nav_mode_and_export_contract_report.md
 
 ## Implementation Summary
-- Added explicit nav mode selector:
-  - `Tool Mode (navTools)`
-  - `Workspace Mode (navWorkspace)`
-- Split UI actions by mode:
-  - navTools: tool session import/export only
-  - navWorkspace: workspace session import/export only
-- Added mode-gated handler checks so actions cannot run from the wrong mode.
-- Tool mode export (`exportCurrentSessionJson`) now exports only the active tool payload JSON.
-- Workspace mode export (`exportWorkspaceSessionJson`) now exports portable workspace container contract:
-  - `version`, `toolId: workspace-v2`
-  - `workspaceSession` with workspace identity, default/active tool, active host context, `toolSessions` grouped by toolId/sessionId, and `savedSessions`
-- Removed runtime-only fields from workspace export payload contract:
-  - `sessionHistory`
-  - `sessionSelection`
-  - `mergeAuditLog`
-  - lone `activeSessionPayload`
-- Added workspace import (`importWorkspaceSessionJson`) with contract validation and state hydration for active session + saved sessions.
-
-## Workspace Contract Alignment Notes
-- Existing repo schemas under `tools/schemas/workspace*.json` are workspace/game manifest contracts for legacy tool ids and are not directly compatible with Workspace V2 tool-session lane.
-- This PR keeps schema files untouched and enforces a Workspace V2 portable session wrapper contract in code/tests.
-- No schema file correction was required for this scoped Workspace V2 runtime/export lane.
+- Removed Workspace V2 Navigation Mode dropdown.
+- Removed Workspace V2 Tool Mode (navTools) controls from UI.
+- Workspace V2 now always runs workspace-context import/export controls only.
+- Wired Workspace V2 import/export buttons directly to workspace-session handlers.
+- Workspace export remains a portable workspace-session wrapper and excludes runtime-only fields:
+  - sessionHistory
+  - sessionSelection
+  - mergeAuditLog
+  - lone activeSessionPayload
+- Tool pages validated to confirm they do not expose workspace-session import/export controls.
 
 ## Validation Commands
 1. `node --check tools/workspace-v2/index.js`
@@ -47,6 +32,10 @@ Workspace V2 only:
    - PASS
    - Results: `tmp/v2-current-session-export-results.json`
 
+## Schema Alignment Note
+- Existing repository workspace schema files are legacy workspace/game manifest contracts and were not modified.
+- This PR keeps Workspace V2 session import/export validation in runtime code for the Workspace V2 portable session wrapper contract.
+
 ## Full Samples Smoke Decision
 - Skipped full samples smoke test.
-- Reason: changes are confined to Workspace V2 import/export/nav-mode logic and validated with targeted runtime checks.
+- Reason: scope is limited to Workspace V2 nav/import/export UI and targeted runtime validation covers the changed behavior.

docs/pr/BUILD_PR_11_276_WORKSPACE_V2_NAV_MODE_SEPARATION_AND_EXPORT_CONTRACT_CORRECTION.md

@@ -1,7 +1,7 @@
-# BUILD_PR_11_276_WORKSPACE_V2_NAV_MODE_SEPARATION_AND_EXPORT_CONTRACT_CORRECTION
+# BUILD_PR_11_276_WORKSPACE_V2_STRICT_NAV_MODE_SEPARATION
 
 ## Purpose
-Implement Workspace V2 nav mode separation for import/export controls and align workspace export/import with a portable workspace-level session contract.
+Continue/fix PR_11_276 by enforcing strict Workspace V2 navigation mode separation and workspace-session-only import/export controls.
 
 ## Files
 - tools/workspace-v2/index.html
@@ -10,31 +10,23 @@ Implement Workspace V2 nav mode separation for import/export controls and align
 - docs/dev/reports/PR_11_276_workspace_v2_nav_mode_and_export_contract_report.md
 
 ## Implementation
-1. Add navigation mode selector in Workspace V2:
-   - `tools` (navTools)
-   - `workspace` (navWorkspace)
-2. Split Import/Export UI into mode-owned action groups:
-   - navTools section keeps single-tool import/export controls
-   - navWorkspace section adds workspace import/export controls
-3. Wire mode rendering in JS with explicit show/hide behavior.
-4. Enforce mode-gated actions:
-   - tool import/export blocked outside tool mode
-   - workspace import/export blocked outside workspace mode
-5. Tool mode export remains tool-payload scoped.
-6. Workspace mode export outputs portable workspace wrapper containing:
+1. Remove nav mode dropdown and all navTools UI controls from Workspace V2.
+2. Keep only workspace-session import/export controls in Workspace V2.
+3. Wire existing Workspace V2 import/export buttons directly to workspace-session handlers.
+4. Keep tool-mode handlers unavailable on Workspace V2 (no mode switching surface).
+5. Preserve workspace-session export contract:
    - workspace identity/version
    - active/default tool identity
-   - included tool payloads grouped by `toolId` and `sessionId`
-   - saved session map
-   - excludes runtime-only fields (`sessionHistory`, `sessionSelection`, `mergeAuditLog`, lone `activeSessionPayload`)
-7. Workspace import validates workspace wrapper contract and restores active session + saved sessions to operational state.
-8. Add targeted runtime coverage for mode separation and export contract behavior.
+   - toolSessions grouped by toolId/sessionId
+   - savedSessions
+   - excludes runtime-only fields (sessionHistory/sessionSelection/mergeAuditLog/lone activeSessionPayload)
+6. Update runtime test to assert strict no-overlap behavior and tool-page workspace-control absence.
 
 ## Acceptance
-- Tool mode only exposes tool import/export actions.
-- Workspace mode only exposes workspace import/export actions.
-- Workspace export is portable wrapper contract and excludes runtime-only fields.
-- Save/Load/Overwrite/Diff/Merge remain operational after workspace import.
+- Workspace V2 has no mode switch and no tool import/export controls.
+- Workspace V2 import/export is workspace-session only.
+- Tool pages do not expose workspace import/export controls.
+- No navTools/navWorkspace overlap on any page.
 
 ## Validation
 - node --check tools/workspace-v2/index.js

docs/pr/PLAN_PR_11_276_WORKSPACE_V2_NAV_MODE_SEPARATION_AND_EXPORT_CONTRACT_CORRECTION.md

@@ -1,7 +1,7 @@
-# PLAN_PR_11_276_WORKSPACE_V2_NAV_MODE_SEPARATION_AND_EXPORT_CONTRACT_CORRECTION
+# PLAN_PR_11_276_WORKSPACE_V2_STRICT_NAV_MODE_SEPARATION
 
 ## Purpose
-Separate tool-vs-workspace navigation modes in Workspace V2 import/export controls and correct workspace export to a portable workspace-level contract.
+Enforce strict Workspace V2 navigation mode separation by removing mode switching and keeping Workspace V2 import/export controls workspace-session only.
 
 ## Scope
 - tools/workspace-v2/index.html
@@ -10,18 +10,16 @@ Separate tool-vs-workspace navigation modes in Workspace V2 import/export contro
 - docs/report only
 
 ## Goals
-- Add explicit nav mode separation:
-  - tool mode (navTools) exposes only tool import/export actions
-  - workspace mode (navWorkspace) exposes only workspace import/export actions
-- Keep tool mode import/export tool-session scoped.
-- Make workspace mode export a portable workspace wrapper contract.
-- Remove runtime-only fields from workspace export payload.
-- Keep Save/Load/Overwrite/Diff/Merge operational with imported/exported workspace data.
+- Remove/hide navigation mode dropdown in Workspace V2.
+- Workspace V2 exposes only navWorkspace import/export controls.
+- No Tool Mode controls on Workspace V2.
+- Workspace import/export validates workspace-session shape.
+- Tool pages do not expose workspace import/export controls.
+- No overlap/switching/fallback between navTools and navWorkspace.
 
 ## Out of Scope
-- No schema file rewrites.
-- No unrelated tool changes.
-- No merge/diff algorithm refactors.
+- No schema rewrites unless strictly required.
+- No unrelated tool behavior changes.
 
 ## Validation
 - node --check tools/workspace-v2/index.js

tests/runtime/V2CurrentSessionExport.test.mjs

@@ -12,6 +12,14 @@ const workspaceJsPath = path.join(repoRoot, "tools", "workspace-v2", "index.js")
 const testPath = path.join(repoRoot, "tests", "runtime", "V2CurrentSessionExport.test.mjs");
 const resultsPath = path.join(repoRoot, "tmp", "v2-current-session-export-results.json");
 
+const TOOL_IDS = [
+  "asset-browser-v2",
+  "palette-manager-v2",
+  "svg-asset-studio-v2",
+  "tilemap-studio-v2",
+  "vector-map-editor-v2"
+];
+
 function checkSyntax(filePath) {
   try {
     execFileSync(process.execPath, ["--check", filePath], {
@@ -24,28 +32,6 @@ function checkSyntax(filePath) {
   }
 }
 
-function simulateToolModeExport(activePayload, currentHostContextId) {
-  if (!activePayload || typeof activePayload !== "object" || Array.isArray(activePayload)) {
-    return {
-      ok: false,
-      status: "No active Workspace V2 session is available to export.",
-      filename: "",
-      serialized: ""
-    };
-  }
-  const payloadToolId = typeof activePayload.toolId === "string" ? activePayload.toolId.trim() : "";
-  const toolIdForFile = payloadToolId || "workspace-v2";
-  const sessionIdForFile = typeof currentHostContextId === "string" && currentHostContextId.trim()
-    ? currentHostContextId.trim()
-    : "session";
-  return {
-    ok: true,
-    status: "Exported current workspace session JSON.",
-    filename: `${toolIdForFile}-${sessionIdForFile}.json`,
-    serialized: JSON.stringify(activePayload, null, 2)
-  };
-}
-
 function simulateWorkspaceModeExport(activePayload, currentHostContextId, library) {
   if (!activePayload || typeof activePayload !== "object" || Array.isArray(activePayload)) {
     return {
@@ -116,37 +102,69 @@ export function run() {
   if (!workspaceJsSyntax.ok) failures.push("tools/workspace-v2/index.js failed syntax check.");
   if (!testSyntax.ok) failures.push("tests/runtime/V2CurrentSessionExport.test.mjs failed syntax check.");
 
-  const requiredHtmlTokens = [
+  const requiredWorkspaceHtmlTokens = [
+    'id="workspaceV2ImportJson"',
+    'id="workspaceV2ImportButton"',
+    'id="workspaceV2ExportButton"',
+    "Import Workspace Session JSON",
+    "Export Workspace Session JSON"
+  ];
+  requiredWorkspaceHtmlTokens.forEach((token) => {
+    if (!workspaceHtml.includes(token)) {
+      failures.push(`Missing required workspace import/export token: ${token}`);
+    }
+  });
+
+  const forbiddenWorkspaceHtmlTokens = [
     'id="workspaceV2NavModeSelect"',
     'id="workspaceV2NavToolsActions"',
     'id="workspaceV2NavWorkspaceActions"',
-    'id="workspaceV2ImportWorkspaceButton"',
-    'id="workspaceV2ExportWorkspaceButton"'
+    "Tool Mode (navTools)",
+    "Import Tool Session JSON",
+    "Export Tool Session JSON"
   ];
-  requiredHtmlTokens.forEach((token) => {
-    if (!workspaceHtml.includes(token)) {
-      failures.push(`Missing nav mode separation HTML token: ${token}`);
+  forbiddenWorkspaceHtmlTokens.forEach((token) => {
+    if (workspaceHtml.includes(token)) {
+      failures.push(`Workspace V2 should not expose mode-switch/tool-mode control: ${token}`);
     }
   });
 
-  const requiredJsTokens = [
-    "currentNavMode()",
-    "renderNavModeActions()",
+  const requiredWorkspaceJsTokens = [
     "importWorkspaceSessionJson()",
     "exportWorkspaceSessionJson()",
     "buildPortableWorkspaceSessionContainer()",
-    "if (!this.inToolsNavMode())",
-    "if (!this.inWorkspaceNavMode())",
+    "runtime-only fields are not allowed in portable workspace payload",
     "toolSessions",
-    "savedSessions",
-    "runtime-only fields are not allowed in portable workspace payload"
+    "savedSessions"
   ];
-  requiredJsTokens.forEach((token) => {
+  requiredWorkspaceJsTokens.forEach((token) => {
     if (!workspaceJs.includes(token)) {
-      failures.push(`Missing nav/export contract JS token: ${token}`);
+      failures.push(`Missing required workspace contract JS token: ${token}`);
     }
   });
 
+  TOOL_IDS.forEach((toolId) => {
+    const toolHtmlPath = path.join(repoRoot, "tools", toolId, "index.html");
+    const toolHtmlExists = fs.existsSync(toolHtmlPath);
+    if (!toolHtmlExists) {
+      failures.push(`Missing tool page HTML: tools/${toolId}/index.html`);
+      return;
+    }
+    const toolHtml = fs.readFileSync(toolHtmlPath, "utf8");
+    const forbiddenToolTokens = [
+      'id="workspaceV2ImportJson"',
+      'id="workspaceV2ImportButton"',
+      'id="workspaceV2ExportButton"',
+      "Import Workspace Session JSON",
+      "Export Workspace Session JSON"
+    ];
+    forbiddenToolTokens.forEach((token) => {
+      if (toolHtml.includes(token)) {
+        failures.push(`Tool page should not expose workspace import/export controls (${toolId}): ${token}`);
+      }
+    });
+  });
+
   const activePayload = {
     version: "v2",
     toolId: "palette-manager-v2",
@@ -159,27 +177,13 @@ export function run() {
       payloadJson: { assetCatalog: { entries: [{ id: "asset-1" }] } }
     }
   };
-
-  const toolExport = simulateToolModeExport(activePayload, "palette-manager-v2-1234567890123-abcd1234");
-  if (!toolExport.ok) failures.push("Tool mode export should succeed when active payload exists.");
-  if (toolExport.filename !== "palette-manager-v2-palette-manager-v2-1234567890123-abcd1234.json") {
-    failures.push("Tool mode export filename mismatch.");
-  }
-  const toolExportParsed = toolExport.serialized ? JSON.parse(toolExport.serialized) : null;
-  if (JSON.stringify(toolExportParsed) !== JSON.stringify(activePayload)) {
-    failures.push("Tool mode export should preserve active tool payload exactly.");
-  }
-
   const workspaceExport = simulateWorkspaceModeExport(activePayload, "palette-manager-v2-1234567890123-abcd1234", library);
-  if (!workspaceExport.ok) failures.push("Workspace mode export should succeed when active payload exists.");
-  if (workspaceExport.filename !== "workspace-v2-palette-manager-v2-palette-manager-v2-1234567890123-abcd1234.json") {
-    failures.push("Workspace mode export filename mismatch.");
-  }
+  if (!workspaceExport.ok) failures.push("Workspace export should succeed when active payload exists.");
   const workspaceExportParsed = workspaceExport.serialized ? JSON.parse(workspaceExport.serialized) : null;
   if (!workspaceExportParsed || typeof workspaceExportParsed !== "object" || Array.isArray(workspaceExportParsed)) {
-    failures.push("Workspace mode export should be an object container.");
+    failures.push("Workspace export should be an object container.");
   } else if (!workspaceExportParsed.workspaceSession || typeof workspaceExportParsed.workspaceSession !== "object") {
-    failures.push("Workspace mode export should include workspaceSession container.");
+    failures.push("Workspace export should include workspaceSession container.");
   } else {
     if (Object.prototype.hasOwnProperty.call(workspaceExportParsed.workspaceSession, "sessionHistory")) {
       failures.push("Workspace export must not include sessionHistory runtime field.");
@@ -193,21 +197,13 @@ export function run() {
     if (Object.prototype.hasOwnProperty.call(workspaceExportParsed.workspaceSession, "activeSessionPayload")) {
       failures.push("Workspace export must not include lone activeSessionPayload runtime field.");
     }
-    if (JSON.stringify(workspaceExportParsed.workspaceSession.savedSessions) !== JSON.stringify(library)) {
-      failures.push("Workspace export should preserve savedSessions payload map.");
-    }
     const activeEntry =
       workspaceExportParsed.workspaceSession.toolSessions?.["palette-manager-v2"]?.["palette-manager-v2-1234567890123-abcd1234"];
     if (JSON.stringify(activeEntry) !== JSON.stringify(activePayload)) {
       failures.push("Workspace export should preserve active payload under toolSessions by tool/session id.");
     }
   }
 
-  const noActiveToolExport = simulateToolModeExport(null, "");
-  if (noActiveToolExport.ok) failures.push("Tool export should fail when active payload is missing.");
-  const noActiveWorkspaceExport = simulateWorkspaceModeExport(null, "", {});
-  if (noActiveWorkspaceExport.ok) failures.push("Workspace export should fail when active payload is missing.");
-
   fs.mkdirSync(path.dirname(resultsPath), { recursive: true });
   fs.writeFileSync(resultsPath, `${JSON.stringify({
     generatedAt: new Date().toISOString(),
@@ -219,10 +215,7 @@ export function run() {
       testSyntax
     },
     scenarios: {
-      toolExport,
-      workspaceExport,
-      noActiveToolExport,
-      noActiveWorkspaceExport
+      workspaceExport
     }
   }, null, 2)}\n`, "utf8");
 

tools/workspace-v2/index.html

@@ -35,30 +35,14 @@ <h2>Producer</h2>
 
       <section class="hub-panel">
         <h2>Import / Export Session JSON</h2>
-        <label for="workspaceV2NavModeSelect">Navigation Mode</label>
-        <select id="workspaceV2NavModeSelect">
-          <option value="tools" selected>Tool Mode (navTools)</option>
-          <option value="workspace">Workspace Mode (navWorkspace)</option>
-        </select>
-        <div id="workspaceV2NavToolsActions">
-          <p>Tool mode actions (navTools): import/export a single active tool session payload.</p>
-          <label for="workspaceV2ImportJson">Tool Session JSON</label>
-          <textarea id="workspaceV2ImportJson" rows="12" spellcheck="false" placeholder='{"toolId":"asset-browser-v2","payloadJson":{}}'></textarea>
-          <label for="workspaceV2ImportFile">Import File</label>
-          <input id="workspaceV2ImportFile" type="file" accept="application/json,.json" />
-          <div>
-            <button id="workspaceV2ImportButton" type="button">Import Tool Session JSON</button>
-            <button id="workspaceV2ExportButton" type="button">Export Tool Session JSON</button>
-          </div>
-        </div>
-        <div id="workspaceV2NavWorkspaceActions" hidden>
-          <p>Workspace mode actions (navWorkspace): import/export a portable Workspace V2 session manifest.</p>
-          <label for="workspaceV2WorkspaceJson">Workspace Session JSON</label>
-          <textarea id="workspaceV2WorkspaceJson" rows="12" spellcheck="false" placeholder='{"version":"v2","toolId":"workspace-v2","workspaceSession":{}}'></textarea>
-          <div>
-            <button id="workspaceV2ImportWorkspaceButton" type="button">Import Workspace Session JSON</button>
-            <button id="workspaceV2ExportWorkspaceButton" type="button">Export Workspace Session JSON</button>
-          </div>
+        <p>Workspace mode actions (navWorkspace): import/export a portable Workspace V2 session manifest.</p>
+        <label for="workspaceV2ImportJson">Workspace Session JSON</label>
+        <textarea id="workspaceV2ImportJson" rows="12" spellcheck="false" placeholder='{"version":"v2","toolId":"workspace-v2","workspaceSession":{}}'></textarea>
+        <label for="workspaceV2ImportFile">Import File</label>
+        <input id="workspaceV2ImportFile" type="file" accept="application/json,.json" />
+        <div>
+          <button id="workspaceV2ImportButton" type="button">Import Workspace Session JSON</button>
+          <button id="workspaceV2ExportButton" type="button">Export Workspace Session JSON</button>
         </div>
       </section>