summaryrefslogtreecommitdiff
path: root/modules/core/module-uishell.js
diff options
context:
space:
mode:
authorAgando <roduccomm@gmail.com>2026-11-07 19:29:06 +0100
committerAgando <roduccomm@gmail.com>2026-11-07 19:29:06 +0100
commita46ebee30cfbbac86abb45068411bc28e1c65503 (patch)
tree35d6b5d1d68a58b11095cf06d7db241c3f7ecf0f /modules/core/module-uishell.js
parent05d72563637e88825ff852d803621c567de47e34 (diff)
fix(newos4): workspace re-opened the modules panel every tick; picker lost two cards; commander was blackHEADv4.6.156main
Three defects reported against v4.6.155, each reproduced before touching code: 1. 'the modules tab keeps opening' (workspace). api.capture() runs dispatchCommand() for real, and the Modules card called bare 'modules' — whose only effect is terminal.openModuleManager(). Every 15 s refresh re-opened the panel (measured: #module-manager display:flex at t+9s and t+18s). The card now captures 'listmods' (same inventory as text), and api.capture() refuses UI-only commands outright so a future card cannot reintroduce it. 2. 'the picker got reduced to 4 items'. showPicker() used this.list() once four modes were registered — but modes are lazy, so that is 'modes you have already visited'. It now always renders the six in level order, taking registered specs for label/tagline. 3. 'commander is mostly black' on a phone. The base sheet's #ui-root rule used body[data-ui-mode]:not(...) #ui-root (1,2,1) and therefore beat every mode's own body[data-ui-mode='x'] #ui-root (1,1,1): commander/studio/cockpit asked for display:grid and got flex column. Commander collapsed to a 253 px centre column in an 844 px page with both rails hidden. Base specificity is now (1,0,0) with an explicit !important hide for classic/boot, and the commander phone query pins grid-template-rows: minmax(0,1fr) so the single row fills. Measured after: picker 6 cards after visiting four modes; #module-manager stays display:none across a refresh cycle; commander display:grid, phone centre 390x810 with a 673 px terminal, desktop 232/788/260 columns. probe-ui-modes.py --cycle -> ALL PASS, 13 checks; shell test 25/25. v4.6.156
Diffstat (limited to 'modules/core/module-uishell.js')
-rw-r--r--modules/core/module-uishell.js28
1 files changed, 20 insertions, 8 deletions
diff --git a/modules/core/module-uishell.js b/modules/core/module-uishell.js
index 11bad38..94e9bd1 100644
--- a/modules/core/module-uishell.js
+++ b/modules/core/module-uishell.js
@@ -365,10 +365,13 @@ class UIShellModule {
// scrollIntoView() on new output scrolled #ui-root by 464px — the title, the action cards
// and the composer all left the screen (measured 2026-11-07). `clip` cannot be scrolled.
'#ui-root{position:fixed;inset:0;display:none;overflow:hidden;overflow:clip;z-index:40;background:var(--bg-color);color:var(--text-color)}',
- // flex column, not block: every mode is a vertical stack (chrome / content / composer /
- // footer) and a block container makes each child's `flex:1 1 auto` inert — the terminal
- // collapsed to 0px and the composer sat at the very bottom of a 4 600px flow.
- 'body[data-ui-mode]:not([data-ui-mode="classic"]) #ui-root{display:flex;flex-direction:column;height:100%}',
+ // flex column, not block: a block container makes each child's `flex:1 1 auto` inert and the
+ // terminal collapsed to 0px. Specificity is deliberately (1,0,0) so a mode that wants a GRID
+ // wins — with the old `body[data-ui-mode]:not(...) #ui-root` (1,2,1) every mode's
+ // `display:grid` was beaten and commander/studio/cockpit laid out as a plain stack
+ // (commander on a phone: two rails hidden, 253px of content in an 844px black page).
+ '#ui-root{display:flex;flex-direction:column;height:100%}',
+ 'body:not([data-ui-mode]) #ui-root,body[data-ui-mode="classic"] #ui-root{display:none!important}',
'#ui-root > *{min-width:0;min-height:0}',
// A non-classic mode owns the viewport: the page itself must not scroll, or terminal
// output drags the action cards off-screen and the composer never comes back.
@@ -451,6 +454,14 @@ class UIShellModule {
.map((a) => a.replace(/^["']/, '').replace(/["']$/, ''));
const cmd = parts[0];
if (!cmd) return Promise.resolve('');
+ // Commands with UI side effects are not capturable: dispatchCommand() runs them for
+ // real, so capturing `modules` re-opened the module-manager panel on every refresh
+ // tick ("the modules tab keeps opening", reported 2026-11-07).
+ const UI_ONLY = ['modules', 'config', 'edit', 'course', 'dashboard', 'ui', 'clear',
+ 'expand', 'sysmsg', 'font-size', 'setfont', 'startup-modules', 'load-local'];
+ if (UI_ONLY.indexOf(cmd) !== -1) {
+ return Promise.resolve('(' + cmd + ' opens a panel — not capturable)');
+ }
return term.capturePipeOutput(cmd, parts.slice(1), raw);
},
fs: term.fs,
@@ -521,16 +532,17 @@ class UIShellModule {
const firstCard = wrap.querySelector('#wx11-ui-picker-list button');
if (firstCard && firstCard.focus) firstCard.focus();
const list = wrap.querySelector('#wx11-ui-picker-list');
- // Fewer than 4 registered means the ext modules are still in flight — use the static list so
- // the user never sees a one-card chooser (the card handler re-checks and warns if missing).
- const modes = this.list().length >= 4 ? this.list() : [
+ // ALWAYS the six, in level order. `this.list()` only holds modes that have already been
+ // fetched, so switching on it showed 4 cards once the user had visited 4 modes and silently
+ // dropped commander/cockpit (reported 2026-11-07). Registered specs win for label/tagline.
+ const modes = [
{ id: 'easy', label: 'Easy', level: 1, icon: '🌱', tagline: 'Just ask. No commands.' },
{ id: 'chat', label: 'Chat', level: 2, icon: '💬', tagline: 'Conversation first.' },
{ id: 'studio', label: 'Studio', level: 3, icon: '🎨', tagline: 'Chat plus a place for your files.' },
{ id: 'workspace', label: 'Workspace', level: 4, icon: '🗂', tagline: 'Everything at a glance.' },
{ id: 'commander', label: 'Commander', level: 5, icon: '⌨️', tagline: 'Terminal with rails.' },
{ id: 'cockpit', label: 'Cockpit', level: 6, icon: '🛰', tagline: 'Live system telemetry.' }
- ];
+ ].map((m) => this.modes[m.id] || m);
modes.forEach(m => {
const b = document.createElement('button');
b.className = 'wx11-btn';