pgkiln 0.87.0 → 0.89.0

package/src/builder/i18n/it.ts

@@ -7510,4 +7510,32 @@ export const it: BuilderMessages = {
   'pjb.steps': 'Passi',
   'pjb.message': 'Messaggio',
   'pjb.no_runs': 'Ancora nessuna esecuzione.',
+  // ------------------------------------------------------------ PWA: every page offline (sprint 168)
+  'pwa.prefetch': 'Rendi disponibili offline tutte le pagine della navigazione dopo l’accesso',
+  'pwa.prefetch_help': 'Richiede Conserva le pagine visitate. Dopo l’accesso, e alla prima pagina aperta su un dispositivo, il dispositivo recupera una alla volta tutte le pagine del menu e della barra di navigazione che l’utente può aprire. Il server le mostra in sola lettura: le pagine che eseguono processi all’apertura vengono escluse e conservate solo quando l’utente le apre.',
+  'pwa.prefetch_hours': 'Recuperarle di nuovo dopo (ore)',
+  'pwa.prefetch_hours_help': 'Da 1 a 168. Le pagine vengono recuperate di nuovo alla prima pagina aperta dopo questo tempo, se c’è connessione.',
+  'pwa.prefetch_hours_range': 'Recuperarle di nuovo dopo: un numero intero di ore da 1 a 168.',
+  // ------------------------------------------------------------ SQL Worksheet: one toolbar row (UX-1)
+  'ws.more': 'Altre azioni',
+  'ws.suggest': 'Suggerisci',
+  'ws.suggest_title': 'Suggerimenti al cursore (Ctrl+Spazio)',
+  'ws.check': 'Verifica',
+  'ws.check_title': 'Pianifica l’SQL senza eseguirlo, come l’Advisor',
+  'ws.key.indent': 'Rientra (Esc, poi Tab: campo successivo)',
+  'ws.search_path_plain': '{schema} per primo nel percorso di ricerca',
+  // ------------------------------------------------------------ Rail labels (UX-3)
+  'rail.labels_show': 'Mostra etichette',
+  'rail.labels_hide': 'Nascondi etichette',
+  // ------------------------------------------------------------ Administration page (UX-4)
+  'wu.filter': 'Filtra le utilità',
+  'wu.filter_none': 'Nessun risultato per il filtro.',
+  'wu.sec.people': 'Persone e accesso',
+  'wu.sec.connections': 'Connessioni',
+  'wu.sec.data': 'Dati e IA',
+  'wu.sec.operations': 'Operazioni',
+  'wu.sec.workspace': 'Area di lavoro {name}',
+  'wu.sec.instance': 'Istanza',
+  // ------------------------------------------------------------ Workspace home: needs attention (UX-13)
+  'wh.attention': 'Richiede attenzione',
 };

package/src/builder/i18n/ja.ts

@@ -7510,4 +7510,32 @@ export const ja: BuilderMessages = {
   'pjb.steps': 'ステップ',
   'pjb.message': 'メッセージ',
   'pjb.no_runs': 'まだ実行はありません。',
+  // ------------------------------------------------------------ PWA: every page offline (sprint 168)
+  'pwa.prefetch': 'サインイン後、ナビゲーションのすべてのページをオフラインで使用できるようにする',
+  'pwa.prefetch_help': '「表示したページを保持」が必要です。サインイン後、およびデバイスで最初のページを開いたときに、ユーザーが開けるナビゲーション メニューとナビゲーション バーのすべてのページを 1 つずつ取得します。サーバーはそれらを読み取り専用で表示します。開くときにプロセスを実行するページは除外され、ユーザーが開いたときにのみ保持されます。',
+  'pwa.prefetch_hours': '再取得までの時間（時間）',
+  'pwa.prefetch_hours_help': '1～168。この時間が過ぎた後、接続があるときに最初にページを開くと再取得されます。',
+  'pwa.prefetch_hours_range': '再取得までの時間: 1～168 の整数の時間を指定してください。',
+  // ------------------------------------------------------------ SQL Worksheet: one toolbar row (UX-1)
+  'ws.more': 'その他の操作',
+  'ws.suggest': '候補',
+  'ws.suggest_title': 'カーソル位置の候補 (Ctrl+Space)',
+  'ws.check': 'チェック',
+  'ws.check_title': 'Advisor と同様に、実行せずに SQL を計画します',
+  'ws.key.indent': 'インデント（Esc の後 Tab: 次のフィールド）',
+  'ws.search_path_plain': '検索パスの先頭は {schema}',
+  // ------------------------------------------------------------ Rail labels (UX-3)
+  'rail.labels_show': 'ラベルを表示',
+  'rail.labels_hide': 'ラベルを非表示',
+  // ------------------------------------------------------------ Administration page (UX-4)
+  'wu.filter': 'ユーティリティを絞り込む',
+  'wu.filter_none': 'フィルターに一致するものはありません。',
+  'wu.sec.people': 'ユーザーとサインイン',
+  'wu.sec.connections': '接続',
+  'wu.sec.data': 'データと AI',
+  'wu.sec.operations': '運用',
+  'wu.sec.workspace': 'ワークスペース {name}',
+  'wu.sec.instance': 'インスタンス',
+  // ------------------------------------------------------------ Workspace home: needs attention (UX-13)
+  'wh.attention': '要対応',
 };

package/src/builder/i18n/ko.ts

@@ -7510,4 +7510,32 @@ export const ko: BuilderMessages = {
   'pjb.steps': '단계',
   'pjb.message': '메시지',
   'pjb.no_runs': '아직 실행이 없습니다.',
+  // ------------------------------------------------------------ PWA: every page offline (sprint 168)
+  'pwa.prefetch': '로그인 후 탐색의 모든 페이지를 오프라인으로 사용할 수 있게 함',
+  'pwa.prefetch_help': '‘방문한 페이지 보관’이 필요합니다. 로그인 후와 기기에서 처음 페이지를 열 때, 기기는 사용자가 열 수 있는 탐색 메뉴와 탐색 모음의 모든 페이지를 하나씩 가져옵니다. 서버는 이를 읽기 전용으로 표시합니다. 열 때 프로세스를 실행하는 페이지는 제외되며 사용자가 열 때만 보관됩니다.',
+  'pwa.prefetch_hours': '다시 가져오기까지의 시간(시간)',
+  'pwa.prefetch_hours_help': '1~168. 이 시간이 지난 뒤 연결되어 있을 때 처음 페이지를 열면 다시 가져옵니다.',
+  'pwa.prefetch_hours_range': '다시 가져오기까지의 시간: 1~168 사이의 정수 시간입니다.',
+  // ------------------------------------------------------------ SQL Worksheet: one toolbar row (UX-1)
+  'ws.more': '추가 작업',
+  'ws.suggest': '제안',
+  'ws.suggest_title': '커서 위치의 제안 (Ctrl+Space)',
+  'ws.check': '검사',
+  'ws.check_title': 'Advisor처럼 실행하지 않고 SQL을 계획합니다',
+  'ws.key.indent': '들여쓰기 (Esc 후 Tab: 다음 필드)',
+  'ws.search_path_plain': '검색 경로의 첫 번째는 {schema}',
+  // ------------------------------------------------------------ Rail labels (UX-3)
+  'rail.labels_show': '레이블 표시',
+  'rail.labels_hide': '레이블 숨기기',
+  // ------------------------------------------------------------ Administration page (UX-4)
+  'wu.filter': '유틸리티 필터',
+  'wu.filter_none': '필터와 일치하는 항목이 없습니다.',
+  'wu.sec.people': '사용자 및 로그인',
+  'wu.sec.connections': '연결',
+  'wu.sec.data': '데이터 및 AI',
+  'wu.sec.operations': '운영',
+  'wu.sec.workspace': '작업 공간 {name}',
+  'wu.sec.instance': '인스턴스',
+  // ------------------------------------------------------------ Workspace home: needs attention (UX-13)
+  'wh.attention': '주의 필요',
 };

package/src/builder/i18n/nl.ts

@@ -7510,4 +7510,32 @@ export const nl: BuilderMessages = {
   'pjb.steps': 'Stappen',
   'pjb.message': 'Melding',
   'pjb.no_runs': 'Nog geen uitvoeringen.',
+  // ------------------------------------------------------------ PWA: every page offline (sprint 168)
+  'pwa.prefetch': 'Alle pagina\'s van de navigatie na het aanmelden offline beschikbaar maken',
+  'pwa.prefetch_help': 'Vereist Bezochte pagina\'s bewaren. Na het aanmelden, en op de eerste pagina die op een apparaat wordt geopend, haalt het apparaat één voor één alle pagina\'s van het navigatiemenu en de navigatiebalk op die de gebruiker mag openen. De server toont ze alleen-lezen: pagina\'s die bij het openen processen uitvoeren worden overgeslagen en pas bewaard als de gebruiker ze opent.',
+  'pwa.prefetch_hours': 'Opnieuw ophalen na (uren)',
+  'pwa.prefetch_hours_help': '1 tot 168. De pagina\'s worden opnieuw opgehaald bij de eerste pagina die na deze tijd wordt geopend, als er verbinding is.',
+  'pwa.prefetch_hours_range': 'Opnieuw ophalen na: een geheel aantal uren van 1 tot 168.',
+  // ------------------------------------------------------------ SQL Worksheet: one toolbar row (UX-1)
+  'ws.more': 'Meer acties',
+  'ws.suggest': 'Suggesties',
+  'ws.suggest_title': 'Suggesties bij de cursor (Ctrl+Spatie)',
+  'ws.check': 'Controleren',
+  'ws.check_title': 'De SQL plannen zonder hem uit te voeren, zoals de Advisor',
+  'ws.key.indent': 'Inspringen (Esc, dan Tab: volgend veld)',
+  'ws.search_path_plain': '{schema} eerst in het zoekpad',
+  // ------------------------------------------------------------ Rail labels (UX-3)
+  'rail.labels_show': 'Labels tonen',
+  'rail.labels_hide': 'Labels verbergen',
+  // ------------------------------------------------------------ Administration page (UX-4)
+  'wu.filter': 'Hulpmiddelen filteren',
+  'wu.filter_none': 'Niets voldoet aan het filter.',
+  'wu.sec.people': 'Mensen en aanmelden',
+  'wu.sec.connections': 'Verbindingen',
+  'wu.sec.data': 'Gegevens en AI',
+  'wu.sec.operations': 'Beheer',
+  'wu.sec.workspace': 'Werkruimte {name}',
+  'wu.sec.instance': 'Instantie',
+  // ------------------------------------------------------------ Workspace home: needs attention (UX-13)
+  'wh.attention': 'Vraagt aandacht',
 };

package/src/builder/i18n/pt.ts

@@ -7510,4 +7510,32 @@ export const pt: BuilderMessages = {
   'pjb.steps': 'Etapas',
   'pjb.message': 'Mensagem',
   'pjb.no_runs': 'Nenhuma execução ainda.',
+  // ------------------------------------------------------------ PWA: every page offline (sprint 168)
+  'pwa.prefetch': 'Disponibilizar todas as páginas da navegação offline após o login',
+  'pwa.prefetch_help': 'Requer Manter as páginas visitadas. Após o login, e na primeira página aberta em um dispositivo, o dispositivo busca uma a uma todas as páginas do menu e da barra de navegação que o usuário pode abrir. O servidor as exibe somente leitura: páginas que executam processos ao abrir são deixadas de fora e mantidas só quando o usuário as abre.',
+  'pwa.prefetch_hours': 'Buscá-las novamente após (horas)',
+  'pwa.prefetch_hours_help': 'De 1 a 168. As páginas são buscadas novamente na primeira página aberta após esse tempo, quando houver conexão.',
+  'pwa.prefetch_hours_range': 'Buscá-las novamente após: um número inteiro de horas de 1 a 168.',
+  // ------------------------------------------------------------ SQL Worksheet: one toolbar row (UX-1)
+  'ws.more': 'Mais ações',
+  'ws.suggest': 'Sugerir',
+  'ws.suggest_title': 'Sugestões no cursor (Ctrl+Espaço)',
+  'ws.check': 'Verificar',
+  'ws.check_title': 'Planejar o SQL sem executá-lo, como o Advisor',
+  'ws.key.indent': 'Recuar (Esc e depois Tab: próximo campo)',
+  'ws.search_path_plain': '{schema} primeiro no caminho de pesquisa',
+  // ------------------------------------------------------------ Rail labels (UX-3)
+  'rail.labels_show': 'Mostrar rótulos',
+  'rail.labels_hide': 'Ocultar rótulos',
+  // ------------------------------------------------------------ Administration page (UX-4)
+  'wu.filter': 'Filtrar os utilitários',
+  'wu.filter_none': 'Nada corresponde ao filtro.',
+  'wu.sec.people': 'Pessoas e login',
+  'wu.sec.connections': 'Conexões',
+  'wu.sec.data': 'Dados e IA',
+  'wu.sec.operations': 'Operações',
+  'wu.sec.workspace': 'Espaço de trabalho {name}',
+  'wu.sec.instance': 'Instância',
+  // ------------------------------------------------------------ Workspace home: needs attention (UX-13)
+  'wh.attention': 'Requer atenção',
 };

package/src/builder/i18n/zh-cn.ts

@@ -7510,4 +7510,32 @@ export const zhCN: BuilderMessages = {
   'pjb.steps': '步骤',
   'pjb.message': '消息',
   'pjb.no_runs': '尚无运行记录。',
+  // ------------------------------------------------------------ PWA: every page offline (sprint 168)
+  'pwa.prefetch': '登录后使导航中的所有页面可离线使用',
+  'pwa.prefetch_help': '需要“将访问过的页面保留在设备上”。登录后，以及在设备上打开第一个页面时，设备会逐个获取用户可以打开的导航菜单和导航栏中的所有页面。服务器以只读方式显示它们：打开时运行进程的页面会被跳过，只有在用户打开时才会保留。',
+  'pwa.prefetch_hours': '多少小时后重新获取',
+  'pwa.prefetch_hours_help': '1 到 168。超过此时间后，在有网络连接时打开第一个页面时会重新获取这些页面。',
+  'pwa.prefetch_hours_range': '重新获取时间：1 到 168 之间的整数小时。',
+  // ------------------------------------------------------------ SQL Worksheet: one toolbar row (UX-1)
+  'ws.more': '更多操作',
+  'ws.suggest': '建议',
+  'ws.suggest_title': '光标处的建议 (Ctrl+Space)',
+  'ws.check': '检查',
+  'ws.check_title': '像 Advisor 一样规划 SQL 而不运行',
+  'ws.key.indent': '缩进（先按 Esc 再按 Tab：下一个字段）',
+  'ws.search_path_plain': '{schema} 位于搜索路径首位',
+  // ------------------------------------------------------------ Rail labels (UX-3)
+  'rail.labels_show': '显示标签',
+  'rail.labels_hide': '隐藏标签',
+  // ------------------------------------------------------------ Administration page (UX-4)
+  'wu.filter': '筛选实用工具',
+  'wu.filter_none': '没有符合筛选条件的项目。',
+  'wu.sec.people': '人员与登录',
+  'wu.sec.connections': '连接',
+  'wu.sec.data': '数据与 AI',
+  'wu.sec.operations': '运维',
+  'wu.sec.workspace': '工作区 {name}',
+  'wu.sec.instance': '实例',
+  // ------------------------------------------------------------ Workspace home: needs attention (UX-13)
+  'wh.attention': '需要注意',
 };

package/src/builder/i18n/zh-tw.ts

@@ -7510,4 +7510,32 @@ export const zhTW: BuilderMessages = {
   'pjb.steps': '步驟',
   'pjb.message': '訊息',
   'pjb.no_runs': '尚無執行記錄。',
+  // ------------------------------------------------------------ PWA: every page offline (sprint 168)
+  'pwa.prefetch': '登入後使導覽中的所有頁面可離線使用',
+  'pwa.prefetch_help': '需要「將造訪過的頁面保留在裝置上」。登入後，以及在裝置上開啟第一個頁面時，裝置會逐一取得使用者可以開啟的導覽選單和導覽列中的所有頁面。伺服器以唯讀方式顯示它們：開啟時執行處理程序的頁面會被略過，只有在使用者開啟時才會保留。',
+  'pwa.prefetch_hours': '多少小時後重新取得',
+  'pwa.prefetch_hours_help': '1 到 168。超過此時間後，在有網路連線時開啟第一個頁面時會重新取得這些頁面。',
+  'pwa.prefetch_hours_range': '重新取得時間：1 到 168 之間的整數小時。',
+  // ------------------------------------------------------------ SQL Worksheet: one toolbar row (UX-1)
+  'ws.more': '更多動作',
+  'ws.suggest': '建議',
+  'ws.suggest_title': '游標處的建議 (Ctrl+Space)',
+  'ws.check': '檢查',
+  'ws.check_title': '像 Advisor 一樣規劃 SQL 而不執行',
+  'ws.key.indent': '縮排（先按 Esc 再按 Tab：下一個欄位）',
+  'ws.search_path_plain': '{schema} 位於搜尋路徑首位',
+  // ------------------------------------------------------------ Rail labels (UX-3)
+  'rail.labels_show': '顯示標籤',
+  'rail.labels_hide': '隱藏標籤',
+  // ------------------------------------------------------------ Administration page (UX-4)
+  'wu.filter': '篩選公用程式',
+  'wu.filter_none': '沒有符合篩選條件的項目。',
+  'wu.sec.people': '人員與登入',
+  'wu.sec.connections': '連線',
+  'wu.sec.data': '資料與 AI',
+  'wu.sec.operations': '維運',
+  'wu.sec.workspace': '工作區 {name}',
+  'wu.sec.instance': '執行個體',
+  // ------------------------------------------------------------ Workspace home: needs attention (UX-13)
+  'wh.attention': '需要注意',
 };

package/src/builder/pwa.ts

@@ -32,7 +32,7 @@ async function pushStats(appId: number) {
   ))!;
 }
 
-export async function pwaSection(a: { id: number; alias: string; pwa: boolean; pwa_short_name: string | null; pwa_offline_pages: boolean; pwa_offline_submit: boolean; pwa_push: boolean; has_icon: boolean }, s: Session) {
+export async function pwaSection(a: { id: number; alias: string; pwa: boolean; pwa_short_name: string | null; pwa_offline_pages: boolean; pwa_prefetch_hours: number | null; pwa_offline_submit: boolean; pwa_push: boolean; has_icon: boolean }, s: Session) {
   const check = (name: string, label: string, on: boolean, help: string) =>
     html`<div class="field"><label class="check"><input type="checkbox" name="${name}" value="true"${on ? raw(' checked') : ''}> ${label}</label><small class="help">${help}</small></div>`;
   const stats = a.pwa && a.pwa_push ? await pushStats(a.id) : null;
@@ -42,6 +42,10 @@ export async function pwaSection(a: { id: number; alias: string; pwa: boolean; p
       ${input('pwa_short_name', tx('pwa.short_name'), a.pwa_short_name ?? '', { placeholder: tx('pwa.short_name_ph') })}
     </div>
     ${check('pwa_offline_pages', tx('pwa.offline_pages'), a.pwa_offline_pages, tx('pwa.offline_pages_help'))}
+    ${check('pwa_prefetch', tx('pwa.prefetch'), a.pwa_prefetch_hours !== null, tx('pwa.prefetch_help'))}
+    <div class="form-grid">
+      ${input('pwa_prefetch_hours', tx('pwa.prefetch_hours'), a.pwa_prefetch_hours ?? 12, { type: 'number', help: tx('pwa.prefetch_hours_help') })}
+    </div>
     ${check('pwa_offline_submit', tx('pwa.offline_submit'), a.pwa_offline_submit, tx('pwa.offline_submit_help'))}
     ${check('pwa_push', tx('pwa.push'), a.pwa_push, tx('pwa.push_help'))}
     <div class="field" data-wide><label class="label" for="f_pwa_icon">${tx('pwa.icon')}</label>
@@ -98,10 +102,17 @@ export async function pwaBuilderRoutes(app: FastifyInstance) {
       flash(s, tx('pwa.push_needs_key'), 'error');
       return back(reply, s, target);
     }
+    // (168) every navigation page offline: only with visited pages kept, every 1 to 168 hours
+    const hours = Number(b.pwa_prefetch_hours ?? 12);
+    if (b.pwa_prefetch === 'true' && (!Number.isInteger(hours) || hours < 1 || hours > 168)) {
+      flash(s, tx('pwa.prefetch_hours_range'), 'error');
+      return back(reply, s, target);
+    }
+    const prefetch = b.pwa_prefetch === 'true' && b.pwa_offline_pages === 'true' ? hours : null;
     await owner.query(
       `update meta.app set pwa = $2, pwa_short_name = $3, pwa_offline_pages = $4, pwa_offline_submit = $5,
-              pwa_icon = case when $7 then $6 else pwa_icon end, pwa_push = $8, updated_at = now() where id = $1`,
-      [id, b.pwa === 'true', (b.pwa_short_name ?? '').trim().slice(0, 30) || null, b.pwa_offline_pages === 'true', b.pwa_offline_submit === 'true', icon ?? null, icon !== undefined, push],
+              pwa_icon = case when $7 then $6 else pwa_icon end, pwa_push = $8, pwa_prefetch_hours = $9, updated_at = now() where id = $1`,
+      [id, b.pwa === 'true', (b.pwa_short_name ?? '').trim().slice(0, 30) || null, b.pwa_offline_pages === 'true', b.pwa_offline_submit === 'true', icon ?? null, icon !== undefined, push, prefetch],
     );
     if (push) await appPublicKey(Number(id));
     flash(s, push && b.pwa !== 'true' ? tx('pwa.saved_not_installable') : tx('pwa.saved'));

package/src/builder/routes.ts

@@ -540,6 +540,24 @@ export async function builderRoutes(app: FastifyInstance) {
     return reply.redirect(`${BASE}/login`, 303);
   });
 
+  // (UX-3) the icon rail with labels next to the icons, or icons only (kept in the developer's session)
+  app.post(`${BASE}/rail`, async (req: Req, reply) => {
+    const s = await developer(req, reply);
+    if (!s) return;
+    if (req.body?.labels === 'labels') s.state.__RAIL = 'labels';
+    else delete s.state.__RAIL;
+    const ref = String(req.headers.referer ?? '');
+    let to = `${BASE}/home`;
+    try {
+      const u = new URL(ref);
+      if (u.host === req.headers.host && u.pathname.startsWith(BASE)) to = u.pathname + u.search;
+    } catch {
+      /* no referer: the home page */
+    }
+    await saveState(s);
+    return reply.redirect(to, 303);
+  });
+
   // The builder's light/dark theme (the developer's menu in the icon rail).
   app.post(`${BASE}/theme`, async (req: Req, reply) => {
     const s = await developer(req, reply);
@@ -654,7 +672,7 @@ export async function builderRoutes(app: FastifyInstance) {
     const tx = tr(s);
 
     const main = html`
-      ${appHeader(a, 'pages', s)}
+      ${appHeader(a, 'pages', s, [`${BASE}/apps/${a.id}/create-page`, tx('app.create_page'), 'plus'])}
       ${appLock && appLock.locked_by !== s.username ? html`<div class="alert alert-error" role="status">${icon('key')} ${lockText(appLock)} ${tx('app.lock_refused')}</div>` : ''}
       <div class="app-home">
       <div class="app-home-main">
@@ -664,7 +682,6 @@ export async function builderRoutes(app: FastifyInstance) {
           <button class="btn">${icon('search')}<span class="sr-only">${tx('common.search')}</span></button></form>
         <div class="seg view-toggle" role="group" aria-label="${tx('ab.view')}">
           <a href="${keep({})}"${icons ? '' : raw(' aria-current="true"')}>${icon('list')} ${tx('ab.view_report')}</a><a href="${keep({ view: 'icons' })}"${icons ? raw(' aria-current="true"') : ''}>${icon('grid')} ${tx('app.view_icons')}</a></div>
-        <a class="btn btn-hot" href="${BASE}/apps/${a.id}/create-page">${icon('plus')} ${tx('app.create_page')}</a>
       </div>
       ${region(tx('app.tab.pages'), html`${grouped
           ? html`<form method="get" class="search u-mwnone u-mb1"><div class="field"><label class="label" for="f_group">${tx('app.page_group')}</label>
@@ -690,7 +707,7 @@ export async function builderRoutes(app: FastifyInstance) {
               ${select('kind', tx('app.page_type'), 'report_form', WIZARD_KINDS.map(([k, label]): [string, string] => [k, kindLabel(k, label)]))}
               ${select('table', tx('app.table_or_view'), '', tables.map((t): [string, string] => [t.t, t.access ? t.t : tx('app.no_access', { table: t.t, role: a.db_role })]))}
             </div>
-            <div class="buttons"><button class="btn btn-hot">${tx('common.next')}</button></div>
+            <div class="buttons"><button class="btn">${tx('common.next')}</button></div>
           </form>
           <p><a href="${BASE}/apps/${a.id}/create-page">${tx('app.all_page_types')} ▸</a></p>
           <p><a href="${BASE}/apps/${a.id}/ai-pages">${tx('app.ai_pages')} ▸</a> <span class="muted">${tx('app.ai_pages_note')}</span></p>`)}
@@ -702,25 +719,19 @@ export async function builderRoutes(app: FastifyInstance) {
               ${select('mode', tx('app.col.mode'), 'normal', ['normal', 'modal'])}
               ${input('parent_page', tx('app.parent'), a.home_page, { type: 'number' })}
             </div>
-            <div class="buttons"><button class="btn btn-hot">${tx('app.create_page')}</button></div>
+            <div class="buttons"><button class="btn">${tx('app.create_page')}</button></div>
           </form>`)}
       </div>
       </div>
       <aside class="app-tasks region region-standard" aria-labelledby="app-tasks-h"><header class="region-header"><h2 id="app-tasks-h">${tx('common.tasks')}</h2></header>
         <ul class="sc-links">
-          <li><a href="/a/${a.alias}" target="_blank" rel="noopener">${icon('play')} ${tx('app.task.run')}</a></li>
-          <li><a href="${BASE}/apps/${a.id}/create-page">${icon('plus')} ${tx('app.create_page')}</a></li>
           <li><a href="${BASE}/apps/${a.id}/create-page?tab=feature">${icon('puzzle')} ${tx('app.task.add_feature')}</a></li>
           <li><a href="${BASE}/apps/${a.id}/create-page?tab=copy">${icon('copy')} ${tx('app.task.copy_page')}</a></li>
           <li><a href="${BASE}/apps/${a.id}/ai-pages">${icon('lightbulb')} ${tx('app.ai_pages')}</a></li>
-          <li><a href="${BASE}/apps/${a.id}/shared">${icon('layers')} ${tx('app.tab.shared')}</a></li>
           <li><a href="${BASE}/apps/${a.id}/shared?type=page_group">${icon('folder')} ${tx('app.task.page_groups')}</a></li>
-          <li><a href="${BASE}/apps/${a.id}/export">${icon('download')} ${tx('app.head.export')}</a></li>
-          <li><a href="${BASE}/apps/${a.id}/backups">${icon('history')} ${tx('app.head.backups')}</a></li>
           <li><a href="${BASE}/apps/${a.id}/supporting-objects">${icon('database')} ${tx('app.task.supporting')}</a></li>
           <li><a href="#app-lock">${icon('lock')} ${tx('app.task.lock')}</a></li>
           ${issues.task}
-          <li><a href="${BASE}/apps/${a.id}/settings?tab=definition">${icon('trash')} ${tx('app.task.delete')}</a></li>
         </ul></aside>
       </div>`;
     return send(reply, s, shell(s, a.name, [[tx('rte.app_builder'), BASE], [a.name]], main));

package/src/builder/sql.ts

@@ -2,7 +2,7 @@ import type { FastifyInstance, FastifyReply } from 'fastify';
 import pg from 'pg';
 import { html, raw, type Raw } from '../html.ts';
 import { icon } from '../icons.ts';
-import { back, BASE, csrf, developer, flash, region, send, shell, workshopTabs, type Req } from './ui.ts';
+import { back, BASE, csrf, developer, flash, pageHeader, region, send, shell, workshopTabs, type Req } from './ui.ts';
 import { owner } from '../db.ts';
 import { clientIp, logActivity, type Session } from '../session.ts';
 import { clearCompletions } from './code-editor.ts';
@@ -70,7 +70,7 @@ async function workshopHome(req: Req, reply: FastifyReply) {
     html`<section class="sw-recent"><h2>${title}</h2>${rows.length ? html`<ul>${rows}</ul>` : html`<p class="muted">${empty}</p>`}</section>`;
   const main = html`<div class="ab-home">
     <div class="ab-main">
-      <h1 class="sr-only">${tx('rail.sql_workshop')}</h1>
+      ${pageHeader(tx('rail.sql_workshop'))}
       ${workshopTabs('home', s)}
       ${await launchpad(s, await isAdmin(s.username))}
       <div class="sw-recents">

package/src/builder/ui.ts

@@ -50,7 +50,24 @@ export async function send(reply: FastifyReply, s: Session, body: string) {
   return reply.type('text/html').send(body);
 }
 
-export type Section = 'home' | 'apps' | 'users' | 'sql' | 'developers' | 'gallery' | 'reporter' | 'team';
+export type Section = 'home' | 'apps' | 'users' | 'sql' | 'developers' | 'gallery' | 'reporter' | 'team' | 'admin';
+
+/**
+ * (UX-3) The rail's current section, from the request's path: one rule for every builder page, so a page doesn't have
+ * to name it (and can't name the wrong one). Administration: the workspace utilities and what they lead to.
+ */
+const ADMIN_PATHS = /^\/builder\/(utilities|users|developers|workspaces?|workspace-(?:import|export|files|credentials)|instance|installation|mail|mail-queue|network|dashboard|telemetry|ui-defaults|icons|vector-providers|ai|sso|backups|db-users|remote-servers|remote-databases|rest-catalogs|app-groups|cross-app)(?:[/?#]|$)/;
+export function sectionOf(path: string | undefined, fallback: Section): Section {
+  if (!path) return fallback;
+  if (/^\/builder\/home(?:[/?#]|$)/.test(path)) return 'home';
+  if (/^\/builder\/sql(?:[/?#]|$)/.test(path)) return 'sql';
+  if (/^\/builder\/(gallery)(?:[/?#]|$)/.test(path)) return 'gallery';
+  if (/^\/builder\/reporter(?:[/?#]|$)/.test(path)) return 'reporter';
+  if (/^\/builder\/team(?:[/?#]|$)/.test(path)) return 'team';
+  if (ADMIN_PATHS.test(path)) return 'admin';
+  if (/^\/builder\/(apps|pages|create|import|blueprints|working-copies)(?:[/?#]|$)/.test(path)) return 'apps';
+  return fallback;
+}
 
 // ------------------------------------------------------------------ builder head
 // Builder-only stylesheets and scripts, loaded on every builder page after
@@ -100,14 +117,15 @@ const initials = (name: string) => name.replace(/[^\p{L}\p{N}]+/gu, ' ').trim().
  * Administration, Help, the developer's menu), an environment banner (091), a compact toolbar with
  * back button and breadcrumb, then the page itself.
  */
-export function shell(s: Session, title: string, crumbs: [string, string?][], main: Raw, section: Section = 'apps', opts: ShellOpts = {}) {
+export function shell(s: Session, title: string, crumbs: [string, string?][], main: Raw, pageSection: Section = 'apps', opts: ShellOpts = {}) {
+  // (UX-3) the rail's current entry follows the request's path; a page's own choice only where the path says nothing
+  const section = sectionOf(s.path, pageSection);
+  const railLabels = s.state.__RAIL === 'labels';
   const ok = takeFlash(s, '__FLASH');
   const err = takeFlash(s, '__ERROR');
   const theme = builderTheme(s);
   // (sprint 121) the developer's builder language (i18n.ts); known English breadcrumb labels are translated here
   const tx = tr(s);
-  // the application these pages belong to (for the Search entry), from the breadcrumb
-  const appId = crumbs.map(([, href]) => /^\/builder\/apps\/(\d+)$/.exec(href ?? '')?.[1]).find(Boolean);
   const rail = (key: Section | 'search' | 'help', href: string, ic: string, label: string, extra: Raw | '' = '') =>
     html`<li><a href="${href}" class="rail-link" title="${label}"${section === key ? raw(' aria-current="page"') : ''}${extra}>${bicon(ic)}<span class="rail-label">${label}</span></a></li>`;
   // (sprint 74) the default-password warning: on the Workspace home (sprint 109), the App Builder home and the Developers page only, until
@@ -131,40 +149,16 @@ export function shell(s: Session, title: string, crumbs: [string, string?][], ma
         ${rail('gallery', `${BASE}/gallery`, 'package', tx('rail.gallery'))}
         ${rail('reporter', `${BASE}/reporter`, 'pie-chart', tx('rail.reporter'))}
         ${rail('team', `${BASE}/team`, 'kanban', tx('rail.team'))}
-        ${appId ? rail('search', `${BASE}/apps/${appId}/search`, 'search', tx('rail.search_app')) : ''}
+        ${rail('admin', `${BASE}/utilities`, 'settings', tx('rail.admin'))}
       </ul>
       <ul class="rail-list rail-bottom">
-        <li><details class="menu rail-user rail-admin">
-          <summary class="rail-link${section === 'users' || section === 'developers' ? ' rail-open' : ''}" title="${tx('rail.admin')}"${section === 'users' || section === 'developers' ? raw(' aria-current="page"') : ''}>${icon('settings')}<span class="rail-label">${tx('rail.admin')}</span></summary>
-          <div class="menu-panel">
-            <div class="menu-section menu-links">
-              <strong>${tx('rail.admin')}</strong>
-              <a href="${BASE}/utilities">${icon('grid')} ${tx('admin.utilities')}</a>
-            </div>
-            ${s.workspace?.admin ? html`<div class="menu-section menu-links">
-              <span class="small muted">${tx('admin.manage_service', { name: s.workspace.name })}</span>
-              <a href="${BASE}/workspaces/${s.workspace.id}#service">${icon('bell')} ${tx('admin.ws_message')}</a>
-              <a href="${BASE}/workspaces/${s.workspace.id}#preferences">${icon('sliders-horizontal')} ${tx('admin.ws_prefs')}</a>
-              <a href="${BASE}/workspaces/${s.workspace.id}#links">${icon('external-link')} ${tx('admin.ext_links')}</a>
-              <a href="${BASE}/workspaces/${s.workspace.id}/utilization">${icon('chart')} ${tx('admin.utilization')}</a>
-              <a href="${BASE}/mail-queue">${icon('inbox')} ${tx('admin.mail_queue')}</a>
-              <a href="${BASE}/network">${icon('globe')} ${tx('admin.network')}</a>
-              <a href="${BASE}/workspaces/${s.workspace.id}">${icon('layers')} ${tx('admin.ws_devs')}</a>
-            </div>` : ''}
-            <div class="menu-section menu-links">
-              <a href="${BASE}/users">${icon('user')} ${tx('admin.users')}</a>
-              <a href="${BASE}/developers">${icon('users')} ${tx('admin.developers')}</a>
-              <a href="${BASE}/dashboard">${icon('activity')} ${tx('admin.monitor')}</a>
-              ${s.instanceAdmin ? html`<a href="${BASE}/db-users">${icon('key')} ${tx('admin.db_users')}</a>` : ''}
-              <a href="${BASE}/developers">${icon('key')} ${tx('admin.change_my_password')}</a>
-            </div>
-          </div></details></li>
         ${s.workspace?.links?.length ? html`<li><details class="menu rail-user rail-admin rail-extensions">
           <summary class="rail-link" title="${tx('rail.extensions')}">${icon('puzzle')}<span class="rail-label">${tx('rail.extensions')}</span></summary>
           <div class="menu-panel"><div class="menu-section menu-links"><strong>${tx('rail.extensions')}</strong>
             ${s.workspace.links.map((l) => html`<a href="${l.url}" target="_blank" rel="noopener noreferrer"${l.description ? html` title="${l.description}"` : ''}>${icon('external-link')} ${l.label}</a>`)}
           </div></div></details></li>` : ''}
         ${rail('help', 'https://github.com/pgkiln/pgkiln/blob/main/docs/guide/03-builder.md', 'help', tx('rail.help'), raw(' target="_blank" rel="noopener"'))}
+        <li><form method="post" action="${BASE}/rail">${csrf(s)}<button class="rail-link rail-toggle" name="labels" value="${railLabels ? '' : 'labels'}" title="${tx(railLabels ? 'rail.labels_hide' : 'rail.labels_show')}" aria-pressed="${railLabels ? 'true' : 'false'}">${bicon(railLabels ? 'left' : 'right')}<span class="rail-label">${tx(railLabels ? 'rail.labels_hide' : 'rail.labels_show')}</span></button></form></li>
         <li><details class="menu rail-user">
           <summary class="rail-avatar${weak ? ' has-dot' : ''}" title="${weak ? tx('user.weak_title', { user: s.username }) : s.username}"><span aria-hidden="true">${initials(s.username ?? '')}</span><span class="sr-only">${tx(weak ? 'user.account_weak' : 'user.account', { user: s.username })}</span></summary>
           <div class="menu-panel">
@@ -213,7 +207,7 @@ export function shell(s: Session, title: string, crumbs: [string, string?][], ma
       </footer>
     </div>
     <div id="builder-texts" hidden data-texts="${JSON.stringify(clientTexts(tx.lang))}"></div>`,
-    `builder-body ide${opts.full ? ' ide-full' : ''}`,
+    `builder-body ide${opts.full ? ' ide-full' : ''}${railLabels ? ' rail-labels' : ''}`,
     {},
     builderHead(),
     { theme, lang: tx.lang },
@@ -225,6 +219,23 @@ export const BANNER_COLORS = ['red', 'orange', 'yellow', 'green', 'teal', 'blue'
 
 export const csrf = (s: Session) => html`<input type="hidden" name="__csrf" value="${s.csrf_token}">`;
 
+/**
+ * (UX-5) A builder page's header: its one heading, its one primary action (accent), a few secondary actions and a ⋯ menu
+ * for the rest. Every builder page should have exactly one H1 and one primary button.
+ */
+export function pageHeader(title: string | Raw, o: { sub?: Raw | string; primary?: [href: string, label: string, ic?: string]; secondary?: [href: string, label: string, ic?: string][]; more?: [href: string, label: string, ic?: string][]; moreLabel?: string } = {}) {
+  const link = ([href, label, ic]: [string, string, string?], cls: string) => html`<a class="${cls}" href="${href}">${ic ? icon(ic) : ''}<span>${label}</span></a>`;
+  return html`<div class="page-head">
+    <div class="page-head-title"><h1>${title}</h1>${o.sub ? html`<p class="page-head-sub muted">${o.sub}</p>` : ''}</div>
+    <div class="page-head-actions">
+      ${(o.secondary ?? []).map((a) => link(a, 'btn'))}
+      ${o.more?.length ? html`<details class="menu page-head-more"><summary class="btn btn-icon" title="${o.moreLabel ?? ''}"><span aria-hidden="true">⋯</span><span class="sr-only">${o.moreLabel ?? ''}</span></summary>
+        <div class="menu-panel align-right"><div class="menu-section menu-links">${o.more.map(([href, label, ic]) => html`<a href="${href}">${ic ? icon(ic) : ''} ${label}</a>`)}</div></div></details>` : ''}
+      ${o.primary ? link(o.primary, 'btn btn-hot') : ''}
+    </div>
+  </div>`;
+}
+
 export function input(name: string, label: string, value: unknown, opts: { type?: string; help?: string; required?: boolean; placeholder?: string; auto?: string } = {}) {
   return html`<div class="field"><label class="label" for="f_${name}">${label}</label>
     <input id="f_${name}" name="${name}" type="${opts.type ?? 'text'}" value="${value ?? ''}"${opts.required ? raw(' required') : ''} placeholder="${opts.placeholder}"${opts.auto ? raw(` autocomplete="${opts.auto}"`) : ''}>
@@ -243,7 +254,7 @@ export const region = (title: string, body: Raw | Raw[], extra: Raw | '' = '', i
   html`<section class="region region-standard"${id ? raw(` id="${id.replace(/[^a-z0-9-]/g, '')}"`) : ''}><header class="region-header"><h2>${title}</h2>${extra}</header><div class="region-body">${body}</div></section>`;
 
 /** Title and tabs of an application's builder pages (Pages, Shared Components, …), in the session's builder language. */
-export const appHeader = (a: any, active: 'pages' | 'shared' | 'settings' | 'activity' | 'api' | 'search' | 'advisor' | 'utilities', s?: Pick<Session, 'state'>) => {
+export const appHeader = (a: any, active: 'pages' | 'shared' | 'settings' | 'activity' | 'api' | 'search' | 'advisor' | 'utilities', s?: Pick<Session, 'state'>, primary?: [href: string, label: string, ic: string]) => {
   const tx = tr(s);
   const tab = (key: typeof active, href: string, ic: string, label: string) =>
     html`<a class="ide-tab" href="${href}"${active === key ? raw(' aria-current="page"') : ''}>${bicon(ic)}<span>${label}</span></a>`;
@@ -256,7 +267,9 @@ export const appHeader = (a: any, active: 'pages' | 'shared' | 'settings' | 'act
           <a class="btn btn-sm" href="${BASE}/apps/${a.id}/backups">${icon('history')} ${tx('app.head.backups')}</a>
           <a class="btn btn-sm" href="${BASE}/apps/${a.id}/availability">${icon('power')} ${tx('app.head.availability')}</a>
           <a class="btn btn-sm" href="${BASE}/apps/${a.id}/export">${icon('download')} ${tx('app.head.export')}</a>
-          <a class="btn btn-sm btn-run" href="/a/${a.alias}" target="_blank" rel="noopener">${icon('play')} ${tx('common.run')}</a>
+          <!-- (UX-5) one primary action: the page's own (Create page on the Pages tab), else Run -->
+          <a class="btn btn-sm${primary ? '' : ' btn-run'}" href="/a/${a.alias}" target="_blank" rel="noopener">${icon('play')} ${tx('common.run')}</a>
+          ${primary ? html`<a class="btn btn-sm btn-hot" href="${primary[0]}">${icon(primary[2])} ${primary[1]}</a>` : ''}
         </div></div>
       <nav class="ide-tabs" aria-label="${tx('app.head.tabs')}">
         ${tab('pages', `${BASE}/apps/${a.id}`, 'pages', tx('app.tab.pages'))}
@@ -323,6 +336,7 @@ export async function developer(req: Req, reply: FastifyReply) {
   // (sprint 121) a session from before the developer's language was kept in it: the stored choice (language.ts)
   if (s.state.__BLANG === undefined) await loadLanguage(s);
   setRequestTranslator(tr(s)); // (sprint 164) scopedTx in this request's handler and helpers
+  s.path = req.url; // (UX-3) the rail's section
   // (sprint 126, SEC-2) the two-factor policy: a banner during the grace period, then only the Security page until they enrol
   delete s.state.__MFA_DUE;
   const admin = await isAdmin(s.username);