From d420b6ee1b113b56779c96493c3a4a306cec96f2 Mon Sep 17 00:00:00 2001
From: Robert Horvath <rhorvath@basepowercompany.com>
Date: Fri, 16 Oct 2026 00:26:40 +0900
Subject: [PATCH] Simplify simulation settings and style signal controls

---
 app/registry.py              | 10 +++++-----
 app/static/app.js            |  9 ++++++++-
 app/static/index.html        | 10 +++++-----
 tests/app_editor_clarity.cjs | 11 +++++++++++
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/registry.py b/app/registry.py
index fa8fc1c2..b818caef 100644
--- a/app/registry.py
+++ b/app/registry.py
@@ -115,11 +115,11 @@ def _field(
     _field("simulation.start_time", "Start time", kind="number", group="Simulation", unit="s"),
     _field("simulation.stop_time", "Stop time", kind="number", group="Simulation", unit="s"),
     _field("simulation.stepSize", "Step size", kind="number", group="Simulation", unit="s"),
-    _field("simulation.solver", "Solver", kind="select", group="Simulation", choices=SOLVER_CHOICES),
-    _field("simulation.tolerance", "Tolerance", kind="number", group="Simulation"),
-    _field("simulation.case_timeout_s", "Case timeout", kind="number", group="Simulation", unit="s"),
-    _field("simulation.no_grid", "No grid", kind="boolean", group="Simulation"),
-    _field("simulation.no_event_emit", "No event emit", kind="boolean", group="Simulation"),
+    _field("simulation.solver", "Solver", kind="select", group="Numerics", choices=SOLVER_CHOICES),
+    _field("simulation.tolerance", "Tolerance", kind="number", group="Numerics"),
+    _field("simulation.case_timeout_s", "Case timeout", kind="number", group="Numerics", unit="s"),
+    _field("simulation.no_grid", "No grid", kind="boolean", group="Numerics"),
+    _field("simulation.no_event_emit", "No event emit", kind="boolean", group="Numerics"),
     _field("execution.parallel", "Parallel", kind="boolean", group="Execution"),
     _field("execution.max_workers", "Max workers", kind="integer", group="Execution"),
     _field("execution.cleanup", "Cleanup raw artifacts", kind="boolean", group="Execution"),
diff --git a/app/static/app.js b/app/static/app.js
index bf58af13..96bc98bf 100644
--- a/app/static/app.js
+++ b/app/static/app.js
@@ -7067,7 +7067,14 @@ function renderSimConfigForm() {
   }
   const busy = (state.status?.jobs || []).some(job => ["queued", "running"].includes(job.status));
   const fields = (state.simConfigPayload.fields || []).filter(field => !(selectedSimulation()?.ggv_source_id && (field.group === "Envelope" || field.path?.[0] === "model_dof")));
-  form.innerHTML = `<fieldset class="simulation-input-fields"${busy ? " disabled" : ""}>${fieldGroupSections(fields, "sim-config")}</fieldset>`;
+  const advancedGroups = new Set(["Numerics", "Execution", "Closed loop", "Fit"]);
+  const physical = fields.filter(field => !advancedGroups.has(field.group));
+  physical.sort((a, b) => (["Simulation", "Report"].indexOf(a.group) + 1) - (["Simulation", "Report"].indexOf(b.group) + 1));
+  const advanced = fields.filter(field => advancedGroups.has(field.group));
+  form.innerHTML = `<fieldset class="simulation-input-fields"${busy ? " disabled" : ""}>
+    ${fieldGroupSections(physical, "sim-config")}
+    ${advanced.length ? `<details class="component-details"><summary>Advanced</summary>${fieldGroupSections(advanced, "sim-config")}</details>` : ""}
+  </fieldset>`;
   if (busy) form.querySelectorAll("button, input, select, textarea").forEach(control => {
     control.title = "Simulation settings are locked while a run is active.";
   });
diff --git a/app/static/index.html b/app/static/index.html
index 793c64c4..384f150f 100644
--- a/app/static/index.html
+++ b/app/static/index.html
@@ -361,17 +361,17 @@ <h4>Controls</h4>
         <section id="studies-view" class="screen">
           <div id="signal-explorer" class="result-explorer-shell" hidden>
             <aside class="workflow-list">
-              <h2><input id="signal-explorer-name" aria-label="Signal Explorer name" maxlength="120"></h2>
-              <label>X axis<select id="result-x-axis"></select></label>
-              <label>Color by<select id="result-color-signal"></select></label>
+              <h2 class="form-field"><input id="signal-explorer-name" aria-label="Signal Explorer name" maxlength="120"></h2>
+              <label class="form-field"><span>X axis</span><select id="result-x-axis"></select></label>
+              <label class="form-field"><span>Color by</span><select id="result-color-signal"></select></label>
               <details id="result-comparison" class="result-comparison">
                 <summary>Comparison</summary>
-                <label>Baseline<select id="result-baseline-source"></select></label>
+                <label class="form-field"><span>Baseline</span><select id="result-baseline-source"></select></label>
                 <label class="result-compare-toggle"><input type="checkbox" id="result-compare-baseline">Show baseline</label>
                 <p id="result-comparison-status" class="muted" role="status"></p>
                 <details id="result-input-changes"><summary title="Compares archived vehicle and analysis settings. Referenced file contents and solver versions are not compared.">Saved settings</summary><div id="result-input-changes-list"></div></details>
               </details>
-              <label>Y signals<input id="result-signal-search" type="search" placeholder="Find a signal"></label>
+              <label class="form-field"><span>Y signals</span><input id="result-signal-search" type="search" placeholder="Find a signal"></label>
               <div id="result-signal-list" class="result-signal-list"></div>
             </aside>
             <section class="result-plot-shell">
diff --git a/tests/app_editor_clarity.cjs b/tests/app_editor_clarity.cjs
index e4f4c731..22a37175 100644
--- a/tests/app_editor_clarity.cjs
+++ b/tests/app_editor_clarity.cjs
@@ -373,6 +373,17 @@ vm.runInContext(`
   renderSimConfigForm();
   assert.equal(form.innerHTML,'edited inputs','background refresh must preserve unsaved fields');
   state.dirtySimConfig=false;
+  state.status={jobs:[]};
+  state.simConfigPayload.fields=[
+    {path:['simulation','solver'],key:'solver',label:'Solver',group:'Numerics',kind:'string',value:'dassl'},
+    {path:['simulation','stop_time'],key:'stop',label:'Stop time',group:'Simulation',kind:'number',value:10},
+    {path:['sweep','velocity'],key:'velocity',label:'Velocity',group:'Sweep',kind:'number',value:12},
+  ];
+  renderSimConfigForm();
+  assert.ok(form.innerHTML.indexOf('sweep.velocity') < form.innerHTML.indexOf('simulation.stop_time'));
+  assert.ok(form.innerHTML.indexOf('<summary>Advanced</summary>') < form.innerHTML.indexOf('simulation.solver'));
+  assert.ok(!form.innerHTML.includes(' open'));
+  state.simConfigPayload=null;
   document=originalDocument;
 }
 `,ctx);