An update that goes wrong is no longer the end of it

Two things the audit found, both about the archive path every shipped .app uses. **Settings could be wiped.** The update kept config/modules.json and config/layouts/ by name, but not config/proddash.json — which holds the admin PIN, the theme and the forge pointer. On an install whose data directory IS the app's own config/ (an unwritable Application Support, or PRODDASH_DATA_DIR aimed inside the app), an update wrote the repo's shipped defaults over it: the theme went, and admin silently unlocked. Nothing inside the data directory is written now, wherever it happens to sit, and the two legacy names stay listed for an install whose state never moved out. **A bad update was unrecoverable.** No rollback, and a fresh .app would not help: seeding only replaces an *older* copy, and a broken one carries a higher version — so the fix was deleting a folder nothing told you about. Three changes, in the order they catch things: - The download must parse before anything is swapped in. `node --check` against the new server.js, and a failure is reported with the syntax error and leaves the running copy untouched. - Past that, the copy being replaced is set aside as `app.previous`, and dropped once the new version has stayed up ninety seconds — so that folder existing means "the last update has not proven itself yet", and never anything older. - The launcher, which already gives up after four stops in two minutes, now looks for that folder before it does and puts the old copy back. Once: if the old one will not run either, the update was not the problem. The launcher half only reaches a machine with a new .app; the server half travels by the normal update. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Merge pull request 'Rules for a clean interface, and the modules brought to them' (#9 ) from claude/module-rules into main
2026-09-17 16:16:46 -04:00 · 2026-09-17 15:52:59 -04:00 · 2026-09-17 15:52:24 -04:00 · 2026-09-17 15:51:34 -04:00 · 2026-09-17 14:22:06 -04:00 · 2026-09-17 13:22:11 -04:00
22 changed files with 1247 additions and 149 deletions
@@ -32,6 +32,12 @@ title-bar controls). The rules that matter most:
  and bump the module's `version` on every change.
 - Browsers never call upstream services directly; the module's server routes
  proxy everything (no CORS, secrets stay server-side).
 - **Keep the interface clean** (guide rules 5-11): no `help` and no label
  over three words in a tile's gear; server-side settings in `configSchema`
  only; a tile setting changes that tile alone; hide-toggles ungrouped when
  there are four or fewer, in a folded **Show** group when there are five or
  more; title-bar controls are icons with tooltips, never labels, and never
  repeat something the gear already offers.
 - Style with the shell's CSS variables only, scoped under
  `[data-module="<id>"]`; survive upstream loss (reconnect + `setStatus`).
 - Verify against the guide's testing section and resilience checklist. Mocks
@@ -99,9 +99,18 @@ with this machine's shell settings — the same keys as the checked-in
 | Key | Meaning |
 | --- | --- |
 | `port` | Port ProdDash serves on (default `24500`). The macOS launcher writes this one, so the port it is set to holds however ProdDash is started. |
-| `adminPasscode` | If set, the admin page asks for this shared passcode. Leave `""` for none — it's a plain-HTTP LAN tool. |
+| `adminPin` | The admin PIN, as a scrypt hash. **Set it in the admin page's Admin PIN section**, not by hand — 6 digits, and only the hash is stored. Absent means admin is open to anyone on the network. |
 | `adminPasscode` | An older free-text passcode. Still honoured, so an existing install keeps working; new installs should use `adminPin`. |
 | `forge` | Where updates and module installs are fetched from. Absent or `"github"` uses GitHub; a Gitea or Forgejo base URL such as `"http://10.3.8.90:3000"` uses a server of your own. Set it per machine in the data directory, alongside `repo`. |
-| `theme` | The dashboard palette: `booth` (default), `harbor`, `graphite`, `ember` or `daylight`. The admin page's **Theme** section writes this one — see [Themes](#themes). |
+| `theme` | The dashboard palette: `booth` (default), `harbor`, `graphite`, `ember`, `daylight`, `midnight`, `moss`, `plum`, `sepia`, `blackout`, `paper` or `iron`. The admin page's **Theme** section writes this one — see [Themes](#themes). |
 **Locked out?** Delete `adminPin` from the data directory's `proddash.json`
 and restart, or start the server with `PRODDASH_PASSCODE` set — that passcode
 overrides the PIN and always gets you in.
 Only `/admin` and the admin API are behind the PIN. Dashboards stay open, so a
 wall display needs no PIN, and it is unrelated to a module's own PIN (Slack's
 4–8 digit send PIN, say), which guards that module's actions only.
 **Updating from your own git server.** ProdDash fetches one `tar.gz` of the
 branch — nothing else — so any Gitea or Forgejo works. Point `forge` at its
@@ -131,12 +140,26 @@ ignored from then on.
 The whole dashboard — every tile, on every browser — draws with one palette,
 chosen in the admin page's **Theme** section and switched live: pick a swatch
-and open dashboards change without a reload. Five presets ship: **Booth**
+and open dashboards change without a reload. The section starts folded —
-(the default dark, mint accent), **Harbor** (deep navy, cyan), **Graphite**
+a building picks its palette once — and holds twelve presets:
-(neutral charcoal, electric blue), **Ember** (warm broadcast black, orange)
+
-and **Daylight**, a light palette for a front-of-house desk in daytime. Each
+| | |
-keeps the status colours apart — the accent is never near the danger red or
+|---|---|
-the warning amber — and muted text readable in a dark booth. The choice is
+| **Booth** | the default dark, mint accent |
 | **Harbor** | deep navy, cyan |
 | **Graphite** | neutral charcoal, electric blue |
 | **Ember** | warm broadcast black, orange |
 | **Daylight** | a cool light palette, for a front-of-house desk in daytime |
 | **Midnight** | indigo night, violet |
 | **Moss** | forest floor, lime |
 | **Plum** | aubergine, purple |
 | **Sepia** | warm brown room, cool teal — Ember's arrangement reversed |
 | **Blackout** | true black, cyan, for a dark room where any glow carries |
 | **Paper** | the warm light one, indigo accent |
 | **Iron** | no colour of its own: a near-white accent, so the only hues on screen are a module's own and the red and amber that mean something |
 Each keeps the status colours apart — the accent is never near the danger red
 or the warning amber — and muted text readable in a dark booth. The choice is
 stored as `theme` in the data directory's `proddash.json` (table above), so
 it holds across restarts and updates; a browser remembers the last theme it
 saw and applies it before the server answers, so nothing flashes. Modules
@@ -177,7 +200,18 @@ below. Nothing is installed without someone clicking.
  no local changes — otherwise the banner says why and you update with git).
  A plain folder (no `.git`) has the repo archive unpacked over it; files
  removed upstream are left behind but harmless. Settings and layouts are
-  never touched. **What changed** opens the commit comparison on GitHub.
+  never touched — nothing inside the data directory is written, even on an
  install where that directory *is* the app's own `config/`. **What changed**
  opens the commit comparison on the forge.
 - **If an update goes wrong**: the download has to parse before anything is
  swapped in, so a truncated or mangled `server.js` is refused with the
  reason and the running copy is left exactly as it was. Past that, the copy
  being replaced is set aside as `app.previous` next to the app folder, and
  dropped once the new version has stayed up for ninety seconds — so that
  folder existing means "the last update has not proven itself yet". The
  macOS app watches for a version that will not stay up (four stops in two
  minutes) and puts the old one back by itself, once, with a notification.
  Running some other way, the way back is a rename: `mv app.previous app`.
 - **Restarting**: after an update the server exits with code 75 and starts
  its own replacement, which waits for the port to free up. If you supervise
  ProdDash with your own launcher, set `PRODDASH_LAUNCHER=1` so the server
@@ -247,7 +281,13 @@ below. Nothing is installed without someone clicking.
  Tile settings: channel icons, direction and timestamps.
 - **ProPresenter** — what's live and what's next, with slide progress,
  driven by the shared `propresenter-core` client (ProPresenter 7/20).
  The ＋ picker offers two tiles: **Now / Next**, the full card, and **Now**,
  the live item alone with the gradient filling the tile edge to edge — a
  wall panel that says one thing.
  Admin config: ProPresenter endpoint (host : port), password.
  Tile settings: a **Show** group of switches for the playlist name, live
  status, NOW and NEXT labels, slide count, progress bar, the next list and
  its item tags, plus tidy titles.
 - **Timers** — live ProPresenter timers (countdown, countdown-to-time,
  elapsed) and LTC timecode as auto-sized cards. The ＋ picker lists every
  discovered timer (and the LTC card) as its own tile, or add "All timers"
@@ -281,6 +321,29 @@ below. Nothing is installed without someone clicking.
  (gear menu): the top-bar text (placeholders such as
  `{series} • {part} | {serviceType} • {date}`), colors, text size, and a
  show/hide checklist for every detail.
 - **Slack** — live transcripts of this location's Slack channels, plus
  PIN-protected sending as the location. The ＋ picker lists one transcript
  tile per configured channel, titled `#channel`, and two send surfaces (one
  of each per dashboard): **Send message**, a free-text box with the admin's
  quick emojis one press away, and **Quick replies**, a grid of preset
  buttons. Both post to the channel of whichever transcript was clicked last
  — its bottom edge lights up in the accent color — and to the first
  configured channel until one is clicked. Messages arrive with avatars,
  names and times, Slack's inline formatting and the workspace's custom
  emoji; a right-click on one opens the reaction menu, and text size and
  jump-to-latest sit in the title bar. Nothing leaves the machine until the
  PIN is entered: one PIN unlocks every Slack tile on that dashboard page
  until the auto-lock idles out, a reload asks again, and the lock button on
  a send tile's title bar ends it early.
  Admin config is in four groups: **Slack account** (the location account's
  User OAuth Token — `xoxp-…`, so messages are literally from the campus —
  or a bot token plus "Send as"), **Channels** (the joined channels to
  follow, one transcript tile each), **Transcript** (refresh interval,
  messages kept, thread replies) and **Sending** (the switch on the group's
  title row, a 4–8 digit PIN, auto-lock minutes, quick replies one per line
  as `Label | Message` — add `| #channel` to bind one to a channel — and up
  to eight quick emojis).
  Tile settings: avatars, timestamps, names and channel notices.
 - **Clock** — a big booth clock; also the smallest possible module and the
  reference for module authors.
@@ -288,10 +351,12 @@ To develop modules against mocks instead of real gear:
 `node tools/prodcom-mock.js` (ProdCom on `127.0.0.1:24480`),
 `node band-lineup-display/tmp/pp-mock.js 1599` (ProPresenter slides on
 `127.0.0.1:1599`), `node tools/pp-timers-mock.js 1600` (ProPresenter
-timers + timecode on `127.0.0.1:1600`) and `node tools/pco-mock.js`
+timers + timecode on `127.0.0.1:1600`), `node tools/pco-mock.js`
 (Planning Center Services on `127.0.0.1:24700` — run ProdDash with
-`PCO_PLAN_API_BASE=http://127.0.0.1:24700`). See the testing section of the
+`PCO_PLAN_API_BASE=http://127.0.0.1:24700`) and
-[module guide](docs/MODULE-GUIDE.md).
+`node tools/slack-mock.js 24716` (the Slack Web API on `127.0.0.1:24716` —
 run ProdDash with `SLACK_API_BASE=http://127.0.0.1:24716/api`). See the
 testing section of the [module guide](docs/MODULE-GUIDE.md).
 ## Install as a desktop web app
@@ -34,6 +34,46 @@ people running the booth depend on them.
   The admin page refuses to install a module whose requirement the running
   shell doesn't meet, and it offers updates by comparing versions.
 ### Keeping the interface clean
 A dashboard is read across a booth, at a glance, by someone doing three
 other things. These rules are what keep every tile looking like one product
 instead of six. They are as binding as the four above.
 5. **No explanatory text in a tile's gear.** No `help` on an
   `instanceSchema` field or an `instanceGroups` entry. Labels are **three
   words at most, one or two preferred** — "Slide count", "Item tags",
   "Running clock". A control that cannot be understood in three words is
   not a display choice; it belongs in `configSchema`, where `help` is
   welcome and expected. *One exception:* a `template` field may keep a
   single `help` line naming its placeholders, which nobody can guess.
 6. **Server-side settings are admin-only.** Anything the module's server
   acts on — a host, a credential, what to fetch, how often to poll — is
   `configSchema`. `instanceSchema` is display choices and nothing else:
   what this tile shows, and how big.
 7. **A tile setting changes that tile and nothing else.** Never another
   tile, never the module as a whole, never the server. If two tiles must
   agree on something, it is either admin config or page state the shell
   owns — not a setting each tile keeps its own copy of.
 8. **Offer toggles for the elements you draw.** Every tile should let the
   operator switch off the parts it does not need. **One to four toggles:**
   give them no `group` at all, so they sit unlabelled at the top of the
   gear. **Five or more:** one group named **Show**, `collapsed: true`,
   `columns: 2`. Nothing else goes in that group — colours, formats and
   text belong in groups of their own.
 9. **Title-bar controls are icons.** No `label` on `addButton` or
   `addMenu`; the tooltip carries the words, and `docs` above covers drawing
   the icon. A small state indicator may ride alongside an icon — ProdCom's
   channel button shows a count while a filter is on — but a control is
   never named in the bar.
 10. **If a control needs words to explain it, it is not a title-bar
    control.** Put it in the gear. The bar is for actions whose icon and
    tooltip say everything: refresh, clear, jump to latest, bigger text.
 11. **One control per action.** Whatever has a dedicated title-bar button is
    not offered again in the gear, and the reverse. Text size is A− / A+ up
    there, never a "Text size" field; a timestamps button in the bar means
    no timestamps switch below it.
 ## The shape of a module
 A module is one folder dropped into `modules/`:
@@ -177,14 +217,18 @@ the group name:
 `help` on a field puts one line of guidance under its control — allowed
 placeholders, where a value comes from. Keep labels short and put the
-explanation there.
+explanation there. **This is for `configSchema` only**: a tile's gear
 carries no explanations at all (rule 5), so a setting that needs one is
 telling you it belongs in admin.
-`group` and `help` work on `instanceSchema` fields too, and a manifest
+`group` works on `instanceSchema` fields too, and a manifest
 `instanceGroups` map plays the `configGroups` role for the tile's gear
-popover (`collapsed: true | false`, `columns`, `help`, `toggle`). That is how
+popover (`collapsed: true | false`, `columns`, `toggle` — but not `help`,
-a module with a long show/hide checklist keeps the popover usable — see
+per rule 5). That is how a module with a long show/hide checklist keeps the
-`pco-plan`. Display choices belong there, per tile; admin config is for
+popover usable: five or more hide-toggles go in one **Show** group, folded
-connections. The popover itself is a small window beside the tile — sized to
+by default, and fewer than five go in no group at all — see `pco-plan` for
 the long form and `slack` for the short one. Display choices belong there,
 per tile; admin config is for connections. The popover itself is a small window beside the tile — sized to
 its content, moved by the slim bar on top, closed by clicking anywhere else
 or pressing Escape — so a tile never has to be big enough to hold its own
 settings, and a change can be watched as it lands. Under everything you
@@ -354,17 +398,19 @@ menu.setLabel('Channels (2/4) ▾'); // update the button text any time
 ```
 Everything you add is removed automatically when your instance stops, so a
-remount never duplicates controls. Keep them compact (icon buttons, short
+remount never duplicates controls. **Icons only, no labels** (rule 9): the
-labels): the title bar is 32 px tall and shared with the tile's name. Draw
+title bar is 32 px tall and shared with the tile's name, and the tooltip
-icons as inline SVG rather than characters — a glyph such as ✕ or ＋ takes
+says what the icon means. Draw icons as inline SVG rather than characters —
-its size from whatever font each browser picks; text-size buttons are a
+a glyph such as ✕ or ＋ takes its size from whatever font each browser
-drawn − and +.
+picks; text-size buttons are a drawn − and +. A small state indicator may
 ride alongside an icon (ProdCom's channel button carries a count while a
 filter is on); a name may not.
-**One control per action.** Whatever has a dedicated header button is not
+**One control per action** (rule 11). Whatever has a dedicated header button
-offered again in the gear popover: text size is A− / A+ up here (persisted
+is not offered again in the gear popover: text size is − / + up here
-through `saveInstanceSettings({ textSize })`, read back with a sane
+(persisted through `saveInstanceSettings({ textSize })`, read back with a
-fallback), never a "Text size" field in `instanceSchema`; a timestamps or
+sane fallback), never a "Text size" field in `instanceSchema`; a timestamps
-newest-first toggle in the header means no such switch in the gear. The
+or newest-first toggle in the header means no such switch in the gear. The
 gear is for display choices that have no button of their own.
 One more thing to know: the whole title bar folds away when the dashboard
@@ -103,6 +103,45 @@ enum ProdDash {
        }
    }
    /**
     Go back to the copy ProdDash set aside before its last update.
     A version that will not stay up is the one state this app cannot talk its
     way out of: the admin page went down with it, and installing a fresh
     `.app` does nothing, because seeding only replaces an *older* copy and a
     broken one carries a higher version. So ProdDash writes `app.previous`
     before it overwrites itself and drops it again once the new version has
     stayed up — meaning that folder exists only while an update is still
     unproven. This puts it back.
     Returns the version restored, or nil when there is nothing to go back to.
     */
    @discardableResult
    static func restorePrevious(root: URL, log: (String) -> Void) -> String? {
        let fm = FileManager.default
        let previous = URL(fileURLWithPath: root.path + ".previous")
        guard isRoot(previous) else { return nil }
        let version = shellVersion(root: previous)
        let named = version.isEmpty ? "(unknown version)" : version
        let broken = URL(fileURLWithPath: root.path + ".broken")
        do {
            try? fm.removeItem(at: broken)
            if fm.fileExists(atPath: root.path) { try fm.moveItem(at: root, to: broken) }
            try fm.moveItem(at: previous, to: root)
            makeWritable(root)
            try? fm.removeItem(at: broken)
            log("rolled ProdDash back to \(named) — the copy it replaced")
            return named
        } catch {
            log("could not roll back to the previous copy: \(error.localizedDescription)")
            // Leave something runnable behind rather than nothing at all.
            if !fm.fileExists(atPath: root.path), fm.fileExists(atPath: broken.path) {
                try? fm.moveItem(at: broken, to: root)
            }
            return nil
        }
    }
    /// Files copied out of a bundle can arrive read-only, and this copy is
    /// exactly where ProdDash writes its own updates.
    private static func makeWritable(_ root: URL) {
@@ -65,6 +65,8 @@ final class ServerController: ObservableObject {
    private var restartAfterExit = false
    private var startedAt: Date?
    private var crashTimes: [Date] = []
    /// One roll-back per bad update: a second would just swap copies forever.
    private var rolledBack = false
    private var pendingRestart: DispatchWorkItem?
    private var healthTimer: Timer?
    private var healthMisses = 0
@@ -299,7 +301,7 @@ final class ServerController: ObservableObject {
        child = nil
        healthy = false
        let ranFor = startedAt.map { Date().timeIntervalSince($0) } ?? 0
-        if ranFor > 60 { crashTimes.removeAll() }   // a long healthy run clears the slate
+        if ranFor > 60 { crashTimes.removeAll(); rolledBack = false }   // a long healthy run clears the slate
        if restartAfterExit {
            restartAfterExit = false
@@ -328,6 +330,22 @@ final class ServerController: ObservableObject {
        crashTimes = crashTimes.filter { Date().timeIntervalSince($0) < 120 }
        guard settings.restartOnCrash, crashTimes.count < 4 else {
            // Before giving up: if an update is still unproven, the copy it
            // replaced is sitting right there. Going back beats sitting dark,
            // and only once — if the old one will not run either, the problem
            // is not the update.
            if settings.restartOnCrash, !rolledBack, let root = rootURL,
               let restored = ProdDash.restorePrevious(root: root, log: { [log] in log.launcher($0) }) {
                rolledBack = true
                crashTimes.removeAll()
                state = .stopped
                message = "Rolled back to ProdDash \(restored) — starting…"
                Notifier.shared.post(title: "ProdDash rolled back",
                                     body: "The new version would not stay up. Back on \(restored).")
                refreshEnvironment()
                start()
                return
            }
            let why = settings.restartOnCrash
                ? "ProdDash stopped \(crashTimes.count) times in two minutes — leaving it stopped."
                : "ProdDash \(how)."
@@ -1,15 +1,23 @@
 {
  "id": "pco-plan",
  "name": "PCO Plan",
-  "version": "1.4.0",
+  "version": "1.5.0",
  "proddash": ">=1.4.0",
  "description": "Order of service from Planning Center Services",
-  "provides": ["timers"],
+  "provides": [
    "timers"
  ],
  "client": "client.js",
  "server": "server.js",
  "style": "style.css",
-  "minSize": { "w": 3, "h": 3 },
+  "minSize": {
-  "defaultSize": { "w": 5, "h": 6 },
+    "w": 3,
    "h": 3
  },
  "defaultSize": {
    "w": 5,
    "h": 6
  },
  "configGroups": {
    "Planning Center credentials": {
      "collapsed": "whenSet",
@@ -48,7 +56,12 @@
      "type": "select",
      "label": "Plan",
      "default": "",
-      "options": [{ "value": "", "label": "Automatic — today's plan, else the next upcoming" }],
+      "options": [
        {
          "value": "",
          "label": "Automatic — today's plan, else the next upcoming"
        }
      ],
      "optionsRoute": "/plans",
      "optionsDependsOn": "serviceTypeId"
    },
@@ -82,8 +95,14 @@
      "group": "Service timing",
      "showWhen": "useDocumentTriggers",
      "options": [
-        { "value": "schedule", "label": "Scheduled service time" },
+        {
-        { "value": "document", "label": "ProPresenter document" }
+          "value": "schedule",
          "label": "Scheduled service time"
        },
        {
          "value": "document",
          "label": "ProPresenter document"
        }
      ]
    },
    "serviceStartDocument": {
@@ -124,37 +143,94 @@
    "Item notes": {
      "toggle": "showNotes"
    },
-    "Show / hide": {
+    "Show": {
      "collapsed": true,
-      "columns": 3,
+      "columns": 2
      "help": "Switch off anything this tile should not show."
    }
  },
  "instanceSchema": {
-    "autoScroll": { "type": "boolean", "label": "Keep the current item in view", "default": true },
+    "autoScroll": {
      "type": "boolean",
      "label": "Auto-scroll",
      "default": true
    },
    "headerTemplate": {
      "type": "template",
      "label": "Top bar text",
      "default": "{series} • {part} | {serviceType} • {date}",
      "group": "Top bar",
      "variables": [
-        { "value": "{series}", "label": "Series" },
+        {
-        { "value": "{part}", "label": "Part / plan title" },
+          "value": "{series}",
-        { "value": "{serviceType}", "label": "Service type" },
+          "label": "Series"
-        { "value": "{date}", "label": "Date" },
+        },
-        { "value": "{shortDate}", "label": "Short date" },
+        {
-        { "value": "{time}", "label": "Service time" },
+          "value": "{part}",
-        { "value": "{length}", "label": "Planned length" },
+          "label": "Part / plan title"
-        { "value": "{items}", "label": "Item count" }
+        },
        {
          "value": "{serviceType}",
          "label": "Service type"
        },
        {
          "value": "{date}",
          "label": "Date"
        },
        {
          "value": "{shortDate}",
          "label": "Short date"
        },
        {
          "value": "{time}",
          "label": "Service time"
        },
        {
          "value": "{length}",
          "label": "Planned length"
        },
        {
          "value": "{items}",
          "label": "Item count"
        }
      ],
      "help": "Use • between items and | to start a second line."
    },
-    "keyColor": { "type": "color", "label": "Song key", "default": "#4ea1ff", "group": "Colors" },
+    "keyColor": {
-    "headerColor": { "type": "color", "label": "Section headers", "default": "#2ee59a", "group": "Colors" },
+      "type": "color",
-    "currentColor": { "type": "color", "label": "Current item", "default": "#2ee59a", "group": "Colors" },
+      "label": "Song key",
-    "headerGradient": { "type": "boolean", "label": "Fade header color to the right", "default": true, "group": "Colors" },
+      "default": "#4ea1ff",
-    "tintByType": { "type": "boolean", "label": "Tint items by type (song / media / other)", "default": false, "group": "Colors" },
+      "group": "Colors"
-    "showNotes": { "type": "switch", "label": "Item notes", "default": true, "group": "Item notes" },
+    },
    "headerColor": {
      "type": "color",
      "label": "Section headers",
      "default": "#2ee59a",
      "group": "Colors"
    },
    "currentColor": {
      "type": "color",
      "label": "Current item",
      "default": "#2ee59a",
      "group": "Colors"
    },
    "headerGradient": {
      "type": "boolean",
      "label": "Header fade",
      "default": true,
      "group": "Colors"
    },
    "tintByType": {
      "type": "boolean",
      "label": "Tint by type",
      "default": false,
      "group": "Colors"
    },
    "showNotes": {
      "type": "switch",
      "label": "Item notes",
      "default": true,
      "group": "Item notes"
    },
    "noteCategories": {
      "type": "multiselect",
      "label": "Categories",
@@ -163,29 +239,149 @@
      "columns": 3,
      "allByDefault": true
    },
-    "showTopBar": { "type": "boolean", "label": "Top bar", "default": true, "group": "Show / hide" },
+    "showTopBar": {
-    "showSeries": { "type": "boolean", "label": "Series name", "default": true, "group": "Show / hide" },
+      "type": "boolean",
-    "showPart": { "type": "boolean", "label": "Part # / plan title", "default": true, "group": "Show / hide" },
+      "label": "Top bar",
-    "showServiceType": { "type": "boolean", "label": "Service type", "default": true, "group": "Show / hide" },
+      "default": true,
-    "showDate": { "type": "boolean", "label": "Plan date", "default": true, "group": "Show / hide" },
+      "group": "Show"
-    "showServiceTime": { "type": "boolean", "label": "Service time", "default": true, "group": "Show / hide" },
+    },
-    "showTotalLength": { "type": "boolean", "label": "Planned total length", "default": true, "group": "Show / hide" },
+    "showSeries": {
-    "showRunningClock": { "type": "boolean", "label": "Running clock (ahead / behind)", "default": true, "group": "Show / hide" },
+      "type": "boolean",
-    "showCountdown": { "type": "boolean", "label": "Countdown to service start", "default": true, "group": "Show / hide" },
+      "label": "Series name",
-    "showHeaders": { "type": "boolean", "label": "Section headers", "default": true, "group": "Show / hide" },
+      "default": true,
-    "showItemNumbers": { "type": "boolean", "label": "Item numbers", "default": false, "group": "Show / hide" },
+      "group": "Show"
-    "showStartTimes": { "type": "boolean", "label": "Scheduled start times", "default": true, "group": "Show / hide" },
+    },
-    "showLength": { "type": "boolean", "label": "Item length", "default": true, "group": "Show / hide" },
+    "showPart": {
-    "showItemType": { "type": "boolean", "label": "Item type badge", "default": true, "group": "Show / hide" },
+      "type": "boolean",
-    "showKey": { "type": "boolean", "label": "Song key", "default": true, "group": "Show / hide" },
+      "label": "Part / title",
-    "showArrangement": { "type": "boolean", "label": "Song arrangement", "default": false, "group": "Show / hide" },
+      "default": true,
-    "showSongAuthor": { "type": "boolean", "label": "Song author / CCLI", "default": false, "group": "Show / hide" },
+      "group": "Show"
-    "showDescription": { "type": "boolean", "label": "Item description", "default": true, "group": "Show / hide" },
+    },
-    "showPreService": { "type": "boolean", "label": "Pre-service items", "default": true, "group": "Show / hide" },
+    "showServiceType": {
-    "showPostService": { "type": "boolean", "label": "Post-service items", "default": true, "group": "Show / hide" },
+      "type": "boolean",
-    "showNowIndicator": { "type": "boolean", "label": "Now indicator", "default": true, "group": "Show / hide" },
+      "label": "Service type",
-    "showItemRuntime": { "type": "boolean", "label": "Item runtime (elapsed vs planned)", "default": true, "group": "Show / hide" },
+      "default": true,
-    "dimCompleted": { "type": "boolean", "label": "Dim completed items", "default": true, "group": "Show / hide" },
+      "group": "Show"
-    "showLiveFooter": { "type": "boolean", "label": "ProPresenter match line", "default": true, "group": "Show / hide" }
+    },
    "showDate": {
      "type": "boolean",
      "label": "Plan date",
      "default": true,
      "group": "Show"
    },
    "showServiceTime": {
      "type": "boolean",
      "label": "Service time",
      "default": true,
      "group": "Show"
    },
    "showTotalLength": {
      "type": "boolean",
      "label": "Total length",
      "default": true,
      "group": "Show"
    },
    "showRunningClock": {
      "type": "boolean",
      "label": "Running clock",
      "default": true,
      "group": "Show"
    },
    "showCountdown": {
      "type": "boolean",
      "label": "Countdown",
      "default": true,
      "group": "Show"
    },
    "showHeaders": {
      "type": "boolean",
      "label": "Section headers",
      "default": true,
      "group": "Show"
    },
    "showItemNumbers": {
      "type": "boolean",
      "label": "Item numbers",
      "default": false,
      "group": "Show"
    },
    "showStartTimes": {
      "type": "boolean",
      "label": "Start times",
      "default": true,
      "group": "Show"
    },
    "showLength": {
      "type": "boolean",
      "label": "Item length",
      "default": true,
      "group": "Show"
    },
    "showItemType": {
      "type": "boolean",
      "label": "Type badge",
      "default": true,
      "group": "Show"
    },
    "showKey": {
      "type": "boolean",
      "label": "Song key",
      "default": true,
      "group": "Show"
    },
    "showArrangement": {
      "type": "boolean",
      "label": "Arrangement",
      "default": false,
      "group": "Show"
    },
    "showSongAuthor": {
      "type": "boolean",
      "label": "Author / CCLI",
      "default": false,
      "group": "Show"
    },
    "showDescription": {
      "type": "boolean",
      "label": "Item description",
      "default": true,
      "group": "Show"
    },
    "showPreService": {
      "type": "boolean",
      "label": "Pre-service",
      "default": true,
      "group": "Show"
    },
    "showPostService": {
      "type": "boolean",
      "label": "Post-service",
      "default": true,
      "group": "Show"
    },
    "showNowIndicator": {
      "type": "boolean",
      "label": "Now indicator",
      "default": true,
      "group": "Show"
    },
    "showItemRuntime": {
      "type": "boolean",
      "label": "Item runtime",
      "default": true,
      "group": "Show"
    },
    "dimCompleted": {
      "type": "boolean",
      "label": "Dim completed",
      "default": true,
      "group": "Show"
    },
    "showLiveFooter": {
      "type": "boolean",
      "label": "Match line",
      "default": true,
      "group": "Show"
    }
  }
 }
@@ -1,7 +1,7 @@
 {
  "id": "prodcom-transcript",
  "name": "ProdCom",
-  "version": "1.3.1",
+  "version": "1.3.2",
  "proddash": ">=1.1.0",
  "description": "Live ProdCom transcript",
  "permissions": [
@@ -40,7 +40,7 @@
  "instanceSchema": {
    "showAvatars": {
      "type": "boolean",
-      "label": "Show channel icons",
+      "label": "Channel icons",
      "default": true
    }
  }
@@ -6,6 +6,12 @@
   in /admin; the tile only renders. */
 export default function create({ root, moduleApi }) {
  /* "now" is the live item on its own, filling the tile; "full" is that plus
     the rest of the playlist. The picker presets `view`; a tile placed before
     this module had a picker has neither, and gets the full card. */
  const view = String(moduleApi.instanceSettings.view || moduleApi.variant || 'full');
  const nowOnly = view === 'now';
  let state = null;
  let feedOffline = false;
  let stream = null;
@@ -33,11 +39,13 @@ export default function create({ root, moduleApi }) {
    </div>`;
  const screenEl = root.querySelector('.nn-screen');
  if (nowOnly) screenEl.classList.add('nn-only-now');
  const topRow = root.querySelector('.nn-top');
  const playlistNameEl = root.querySelector('.nn-playlist');
  const liveEl = root.querySelector('.nn-live');
  const liveTextEl = root.querySelector('.nn-live-text');
  const nowEl = root.querySelector('.nn-now');
  const nowLabelEl = root.querySelector('.nn-label');
  const nowTitleBox = root.querySelector('.nn-title-box');
  let nowTitleEl = root.querySelector('.nn-title');
  const nowMetaEl = root.querySelector('.nn-meta');
@@ -47,9 +55,11 @@ export default function create({ root, moduleApi }) {
  const nextListEl = root.querySelector('.nn-next-list');
  const nextMoreEl = root.querySelector('.nn-next-more');
  /** A setting, defaulting to on — a Now tile's schema omits the Next ones. */
  function prefs() {
-    return moduleApi.instanceSettings; // showPlaylist / showProgress / cleanTitles
+    return moduleApi.instanceSettings;
  }
  const on = (key) => prefs()[key] !== false;
  /* ── title tidying (same rule as propresenter-core.cleanItemName) ─ */
@@ -65,7 +75,7 @@ export default function create({ root, moduleApi }) {
  }
  function displayName(raw) {
-    return prefs().cleanTitles ? cleanItemName(raw) : String(raw || '').trim();
+    return on('cleanTitles') ? cleanItemName(raw) : String(raw || '').trim();
  }
  function itemTypeTag(type) {
@@ -307,7 +317,9 @@ export default function create({ root, moduleApi }) {
    const total = state.currentSlideTotal || activeItem?.slideCount || 0;
    const current = state.currentSlide || 0;
-    if (total > 0 && current > 0) {
+    if (!on('showSlideCount')) {
      nowMetaEl.textContent = '';
    } else if (total > 0 && current > 0) {
      const remaining = Math.max(0, total - current);
      nowMetaEl.textContent = `Slide ${current} / ${total} · ${remaining} left`;
    } else if (total > 0) {
@@ -318,7 +330,7 @@ export default function create({ root, moduleApi }) {
      nowMetaEl.textContent = '';
    }
-    if (prefs().showProgress && total > 0) {
+    if (on('showProgress') && total > 0) {
      progressEl.hidden = false;
      const pct = current > 0 ? Math.max(0, Math.min(100, (current / total) * 100)) : 0;
      progressFillEl.style.width = `${pct}%`;
@@ -349,6 +361,10 @@ export default function create({ root, moduleApi }) {
      nameEl.textContent = displayName(item.name) || '(untitled)';
      row.appendChild(nameEl);
      if (!on('showTags')) {
        nextListEl.appendChild(row);
        continue;
      }
      if (item.type === 'presentation' && Number.isInteger(item.slideCount)) {
        const chip = document.createElement('div');
        chip.className = 'nn-count-chip';
@@ -366,7 +382,7 @@ export default function create({ root, moduleApi }) {
      nextListEl.appendChild(row);
    }
-    nextLabelEl.hidden = upcoming.length === 0;
+    nextLabelEl.hidden = upcoming.length === 0 || !on('showNextLabel');
    nextMoreEl.hidden = true;
    markNextOverflow();
    requestAnimationFrame(markNextOverflow);
@@ -374,12 +390,22 @@ export default function create({ root, moduleApi }) {
  function render() {
    screenEl.classList.toggle('is-offline', feedOffline);
-    const showTop = prefs().showPlaylist || feedOffline || !state?.reachable || !state?.enabled;
+    // Trouble always shows, whatever is switched off: a tile that has stopped
-    topRow.classList.toggle('hidden-row', !showTop);
+    // updating must never look like one with nothing live.
-    playlistNameEl.textContent = prefs().showPlaylist ? state?.playlistName || '' : '';
+    const trouble = feedOffline || !state?.reachable || !state?.enabled;
    const wantPlaylist = on('showPlaylist');
    const wantLive = on('showLive') || trouble;
    topRow.classList.toggle('hidden-row', !wantPlaylist && !wantLive);
    liveEl.hidden = !wantLive;
    // Hidden, not just emptied: it is flex:1, so an emptied one still holds
    // the row open and pushes the live dot off the right edge.
    playlistNameEl.hidden = !wantPlaylist;
    playlistNameEl.textContent = state?.playlistName || '';
    nowLabelEl.hidden = !on('showNowLabel');
    screenEl.classList.toggle('nn-no-next', nowOnly || !on('showNext'));
    renderLive();
    renderNow();
-    renderNext();
+    if (!nowOnly && on('showNext')) renderNext();
  }
  /* ── sizing: --unit scales the whole card to the tile ───────────── */
@@ -387,6 +413,10 @@ export default function create({ root, moduleApi }) {
  function applyUnit() {
    const unit = Math.max(6.5, Math.min(20, root.clientHeight * 0.032));
    screenEl.style.setProperty('--unit', unit.toFixed(2) + 'px');
    // On a Now tile the top row floats over the gradient, so at the shortest
    // sizes it would sit on the title. Below the height it needs, it goes —
    // the header dot and the title itself still report trouble.
    screenEl.classList.toggle('nn-tight', nowOnly && root.clientHeight < unit * 9);
  }
  /* ── live feed ──────────────────────────────────────────────────── */
@@ -1,32 +1,100 @@
 {
  "id": "propresenter-now-next",
  "name": "ProPresenter",
-  "version": "1.0.1",
+  "version": "1.1.1",
-  "proddash": ">=1.1.0",
+  "proddash": ">=1.5.0",
  "description": "What is live in ProPresenter and what comes next",
  "permissions": [
-    { "kind": "local-network", "reason": "Reaching ProPresenter on this network" }
+    {
      "kind": "local-network",
      "reason": "Reaching ProPresenter on this network"
    }
  ],
  "client": "client.js",
  "server": "server.js",
  "style": "style.css",
-  "minSize": { "w": 3, "h": 3 },
+  "minSize": {
-  "defaultSize": { "w": 4, "h": 5 },
+    "w": 3,
    "h": 3
  },
  "defaultSize": {
    "w": 4,
    "h": 5
  },
  "configSchema": {
    "propresenter": {
      "type": "endpoint",
      "label": "ProPresenter",
-      "default": { "host": "", "port": 1025 }
+      "default": {
        "host": "",
        "port": 1025
      }
    },
    "password": {
      "type": "password",
-      "label": "API password (only if set in ProPresenter)",
+      "label": "Password",
      "default": ""
    }
  },
  "instanceSchema": {
-    "showPlaylist": { "type": "boolean", "label": "Show the playlist name", "default": true },
+    "cleanTitles": {
-    "showProgress": { "type": "boolean", "label": "Show the slide progress bar", "default": true },
+      "type": "switch",
-    "cleanTitles": { "type": "boolean", "label": "Tidy titles (hide [ Full ] tags and date codes)", "default": true }
+      "label": "Tidy titles",
      "default": true
    },
    "showPlaylist": {
      "type": "switch",
      "label": "Playlist",
      "default": true,
      "group": "Show"
    },
    "showLive": {
      "type": "switch",
      "label": "Live status",
      "default": true,
      "group": "Show"
    },
    "showNowLabel": {
      "type": "switch",
      "label": "Now label",
      "default": true,
      "group": "Show"
    },
    "showSlideCount": {
      "type": "switch",
      "label": "Slide count",
      "default": true,
      "group": "Show"
    },
    "showProgress": {
      "type": "switch",
      "label": "Progress bar",
      "default": true,
      "group": "Show"
    },
    "showNext": {
      "type": "switch",
      "label": "Next list",
      "default": true,
      "group": "Show"
    },
    "showNextLabel": {
      "type": "switch",
      "label": "Next label",
      "default": true,
      "group": "Show"
    },
    "showTags": {
      "type": "switch",
      "label": "Item tags",
      "default": true,
      "group": "Show"
    }
  },
  "instanceGroups": {
    "Show": {
      "collapsed": true,
      "columns": 2
    }
  }
 }
@@ -108,6 +108,43 @@ module.exports = {
    };
  },
  /**
   * Two ways to place this module. "Now / Next" is the full card — what is
   * live, then the rest of the playlist. "Now" is the same live item alone,
   * edge to edge with the gradient filling the tile: a wall display that says
   * one thing. The Now entry offers only the settings it can act on, so its
   * gear carries no Next switches.
   */
  tiles() {
    return [
      {
        id: 'full',
        name: 'Now / Next',
        description: 'What is live, and the rest of the playlist',
        defaultSize: { w: 4, h: 5 },
        minSize: { w: 3, h: 3 },
        settings: { view: 'full' },
      },
      {
        id: 'now',
        name: 'Now',
        description: 'Only what is live, filling the tile',
        defaultSize: { w: 4, h: 2 },
        minSize: { w: 2, h: 1 },
        settings: { view: 'now' },
        instanceSchema: {
          cleanTitles: { type: 'switch', label: 'Tidy titles', default: true },
          showPlaylist: { type: 'switch', label: 'Playlist', default: true, group: 'Show' },
          showLive: { type: 'switch', label: 'Live status', default: true, group: 'Show' },
          showNowLabel: { type: 'switch', label: 'Now label', default: true, group: 'Show' },
          showSlideCount: { type: 'switch', label: 'Slide count', default: true, group: 'Show' },
          showProgress: { type: 'switch', label: 'Progress bar', default: true, group: 'Show' },
        },
        instanceGroups: { Show: { collapsed: true, columns: 2 } },
      },
    ];
  },
  routes() {
    return {
      'GET /state': (req, res) => {
@@ -21,6 +21,51 @@
  justify-content: center;
 }
 /* NEXT switched off, or a Now tile: the list goes and the card takes the room. */
 [data-module="propresenter-now-next"] .nn-screen.nn-no-next .nn-next-wrap { display: none; }
 [data-module="propresenter-now-next"] .nn-screen.nn-no-next { justify-content: center; }
 /* ── the "Now" tile ──
   Only what is live, edge to edge: the gradient moves off the card and onto
   the whole tile, the card loses its border, radius and box, and the title
   sits in the middle of everything. Nothing is inset, so a wall of these
   reads as panels of colour rather than cards on a background. */
 [data-module="propresenter-now-next"] .nn-screen.nn-only-now {
  gap: 0;
  background: linear-gradient(
    160deg,
    color-mix(in srgb, var(--accent) 14%, transparent),
    color-mix(in srgb, var(--bg) 70%, transparent)
  );
 }
 [data-module="propresenter-now-next"] .nn-only-now .nn-now {
  flex: 1;
  height: auto;
  min-height: 0;
  justify-content: center;
  border: none;
  border-radius: 0;
  background: none;
  padding: 0;
 }
 /* The live dot and playlist ride over the gradient rather than above it. */
 [data-module="propresenter-now-next"] .nn-only-now .nn-top {
  position: absolute;
  inset: var(--nn-pad) var(--nn-pad) auto;
  pointer-events: none;
 }
 [data-module="propresenter-now-next"] .nn-only-now .nn-title-box { margin-top: 0; }
 /* The overlay floats, so it takes no room — this keeps the title clear of it
   and still centred, by holding back as much at the bottom as at the top. */
 [data-module="propresenter-now-next"] .nn-only-now:not(.nn-tight) .nn-now {
  padding: calc(var(--unit) * 1.4) 0;
 }
 /* Too short for the overlay: the title gets the whole panel to itself. */
 [data-module="propresenter-now-next"] .nn-only-now.nn-tight .nn-top,
 [data-module="propresenter-now-next"] .nn-only-now.nn-tight.is-offline .nn-top {
  display: none !important;
 }
 /* ── top row ── */
 [data-module="propresenter-now-next"] .nn-top {
@@ -59,6 +104,7 @@
  overflow: hidden;
  text-overflow: ellipsis;
 }
 [data-module="propresenter-now-next"] .nn-playlist[hidden] { display: none; }
 [data-module="propresenter-now-next"] .nn-live {
  display: flex;
@@ -71,6 +117,7 @@
  text-transform: uppercase;
  color: var(--muted);
 }
 [data-module="propresenter-now-next"] .nn-live[hidden] { display: none; }
 [data-module="propresenter-now-next"] .nn-live-dot {
  width: calc(var(--unit) * 0.6);
@@ -122,6 +169,7 @@
  text-transform: uppercase;
  color: var(--accent);
 }
 [data-module="propresenter-now-next"] .nn-label[hidden] { display: none; }
 [data-module="propresenter-now-next"] .nn-title-box {
  flex: 1;
@@ -15,7 +15,7 @@
   Per-tile choices: the gear popover's static switches (whole sources,
   headings, status lines, the clock's format, the state colours) and the
-   "Timers ▾" header menu, which hides any single timer — keyed `source:id`
+   timers header menu, which hides any single timer — keyed `source:id`
   and saved with the layout via saveInstanceSettings. The header can be
   hidden by the user, so the static switches stay the primary controls.
   A solo tile's gear carries only the settings its one card can use (the
@@ -196,6 +196,10 @@ function defaultStatus(timer, value, tone) {
 /* ── the tile ─────────────────────────────────────────────────────────── */
 /* The header menu's icon: a stopwatch, for the list of timers behind it.
   Title-bar controls carry no words (module guide, rule 9). */
 const TIMERS_SVG = '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M10 2h4"/><path d="M12 14V9"/><circle cx="12" cy="14" r="8"/></svg>';
 export default function create({ root, moduleApi }) {
  let state = null;
  let feedOffline = false;
@@ -227,7 +231,7 @@ export default function create({ root, moduleApi }) {
  }
  /* Which picker entry this tile was added as (the module's tiles() list):
-     '' or 'all' = every timer, selectable via the Timers ▾ menu;
+     '' or 'all' = every timer, selectable via the timers menu;
     'solo:<source>:<id>' = exactly one card, no menu, no headings. The
     earlier entries 'timer:<uuid>' and 'ltc' map onto the new keys. */
  const variant = String(moduleApi.variant || '');
@@ -283,8 +287,8 @@ export default function create({ root, moduleApi }) {
  let menuEl = null; // the open menu's element (filled on each open)
  const itemsMenu = solo ? null : moduleApi.header.addMenu({
-    label: 'Timers ▾',
+    icon: TIMERS_SVG,
-    title: 'Choose timers',
+    title: 'Timers',
    build(menu) {
      // the shell hands over an emptied element on every open
      menu.classList.add('tm-menu');
@@ -292,6 +296,12 @@ export default function create({ root, moduleApi }) {
      rebuildMenu(true);
    },
  });
  // The icon carries the name; a count rides alongside it while some timers
  // are hidden, so the bar says "filtered" without saying it in words.
  const itemsCountEl = document.createElement('span');
  itemsCountEl.className = 'tm-count';
  itemsCountEl.hidden = true;
  if (itemsMenu) itemsMenu.button.appendChild(itemsCountEl);
  function menuRows() {
    const rows = [];
@@ -319,7 +329,9 @@ export default function create({ root, moduleApi }) {
    if (!itemsMenu) return;
    const rows = menuRows();
    const visible = rows.filter((r) => !hidden.has(r.key)).length;
-    itemsMenu.setLabel(visible === rows.length ? 'Timers ▾' : `Timers (${visible}/${rows.length}) ▾`);
+    const filtering = visible !== rows.length;
    itemsCountEl.textContent = filtering ? `${visible}/${rows.length}` : '';
    itemsCountEl.hidden = !filtering;
  }
  let menuSignature = '';
@@ -779,7 +791,7 @@ export default function create({ root, moduleApi }) {
    let hint = '';
    const groups = visibleGroups();
    if (state && !state.sources.length) hint = 'Every source is switched off — turn one on in Admin.';
-    else if (state && !groups.length) hint = 'Nothing selected — switch a source on in this tile’s settings, or pick timers in the Timers ▾ menu.';
+    else if (state && !groups.length) hint = 'Nothing selected — switch a source on in this tile’s settings, or pick timers in the title bar’s timers menu.';
    hintEl.hidden = !hint;
    hintEl.textContent = hint;
    groupsEl.hidden = Boolean(hint);
@@ -1,7 +1,7 @@
 {
  "id": "propresenter-timers",
  "name": "Timers",
-  "version": "1.3.0",
+  "version": "1.4.0",
  "proddash": ">=1.4.0",
  "description": "Timers, Clocks, and LTC From configured Modules",
  "provides": [
@@ -112,7 +112,7 @@
  },
  "instanceGroups": {
    "Show": {
-      "collapsed": false,
+      "collapsed": true,
      "columns": 2
    },
    "Clock": {
@@ -121,8 +121,7 @@
    },
    "Colours": {
      "collapsed": true,
-      "columns": 2,
+      "columns": 2
      "help": "The time's colour per state. Left at the default, a colour follows the dashboard theme; one you change here wins over it."
    }
  },
  "instanceSchema": {
@@ -321,7 +321,7 @@
@keyframes tm-nosignal-blink { 50% { opacity: 0.35; } }
-/* ── the "Timers ▾" menu (container styled/positioned by the shell) ── */
+/* ── the timers menu (container styled/positioned by the shell) ── */
 [data-module="propresenter-timers"] .tm-menu-item {
  display: flex;
@@ -383,3 +383,11 @@
  font-size: 12px;
  white-space: nowrap;
 }
 /* the count beside the title-bar timers icon, while some are hidden */
 [data-module="propresenter-timers"] .tm-count {
  font-size: 10px;
  font-weight: 700;
  font-variant-numeric: tabular-nums;
 }
 [data-module="propresenter-timers"] .tm-count[hidden] { display: none; }
@@ -141,13 +141,17 @@ const sendTarget = (() => {
    /**
     * Where a send goes, given the configured channels in admin order: the
     * selection while it is still configured and its transcript is on the
-     * page; otherwise the first configured channel.
+     * page, else the first configured channel that IS on this page — with one
     * transcript up, that one — and only if the page shows none, the first
     * configured channel. A send must never quietly go to a channel the
     * operator cannot see.
     */
    resolve(configured) {
      const list = Array.isArray(configured) ? configured : [];
      if (!list.length) return '';
      if (id && list.includes(id) && this.hasTranscript(id)) return id;
-      return list[0];
+      const onPage = list.find((c) => this.hasTranscript(c));
      return onPage || list[0];
    },
    on(fn) {
      bus.addEventListener('change', fn);
@@ -1100,7 +1104,7 @@ function createSendTile({ root, moduleApi, mode }) {
    if (stopped || !state) return;
    if (token) {
      if (composeEls) {
-        composeEls.line.textContent = sendingLine();
+        if (composeEls.line) composeEls.line.textContent = sendingLine();
        if (composeEls.input) composeEls.input.placeholder = placeholder();
      }
    } else renderGate();
@@ -1177,14 +1181,21 @@ function createSendTile({ root, moduleApi, mode }) {
  let composeEls = null;
  function buildCompose() {
    compose.textContent = '';
-    const head = el('div', 'sl-compose-head');
+    // Send message names the channel in the box's own placeholder and locks
-    const line = el('span', 'sl-sending', sendingLine());
+    // from the title bar, so a line above the field would only say both
-    const lockLink = el('button', 'sl-lock-link', 'Lock');
+    // again. Quick replies has no placeholder — there it is the only place
-    lockLink.type = 'button';
+    // the target is named, so it stays.
-    lockLink.title = 'Lock now';
+    let line = null;
-    lockLink.addEventListener('click', () => lock('Locked'));
+    if (mode !== 'send') {
-    head.append(line, lockLink);
+      const head = el('div', 'sl-compose-head');
-    compose.appendChild(head);
+      line = el('span', 'sl-sending', sendingLine());
      const lockLink = el('button', 'sl-lock-link', 'Lock');
      lockLink.type = 'button';
      lockLink.title = 'Lock now';
      lockLink.addEventListener('click', () => lock('Locked'));
      head.append(line, lockLink);
      compose.appendChild(head);
    }
    const foot = el('div', 'sl-compose-foot');
    const msg = el('div', 'sl-msg');
@@ -1462,7 +1473,7 @@ function createSendTile({ root, moduleApi, mode }) {
      if (!s.sending?.enabled || !s.sending?.pinSet) return void lock('');
      if (!composeEls) return void showCompose(); // the page was unlocked before this tile appeared
      if (composeEls) {
-        composeEls.line.textContent = sendingLine();
+        if (composeEls.line) composeEls.line.textContent = sendingLine();
        if (composeEls.input) composeEls.input.placeholder = placeholder();
      }
    } else renderGate();
@@ -1,7 +1,7 @@
 {
  "id": "slack",
  "name": "Slack",
-  "version": "1.2.0",
+  "version": "1.2.1",
  "proddash": ">=1.4.0",
  "description": "Live transcripts of this location's Slack channels, plus PIN-protected sending as the location",
  "client": "client.js",
@@ -21,7 +21,7 @@
      "help": "Create a Slack app in the workspace (api.slack.com/apps → Create New App → From scratch) and, under OAuth & Permissions → User Token Scopes, add channels:history, channels:read, groups:history, groups:read, chat:write, users:read, reactions:write (emoji reactions) and emoji:read (the workspace's custom emoji). Sign in to Slack as this location's account — the one named for the campus — open the app's OAuth & Permissions page and press Install to Workspace (or Reinstall to Workspace), then copy the User OAuth Token (xoxp-…) it shows and paste it here: messages from this machine are then literally from the location. A bot token (xoxb-…) works too; it posts as the app, with \"Send as\" naming the location."
    },
    "Channels": {
-      "help": "Every channel picked here becomes its own transcript tile in the ＋ picker, titled with the channel's name. The Send message and Quick replies tiles post to whichever transcript was clicked last — its bottom edge lights up in the accent colour — and to the first channel here until one is clicked. Only channels the account has joined are listed; join one in Slack first. Each channel is read on its own schedule, all of them together kept inside Slack's rate limit."
+      "help": "Every channel picked here becomes its own transcript tile in the ＋ picker, titled with the channel's name. The Send message and Quick replies tiles post to whichever transcript was clicked last — its bottom edge lights up in the accent colour — and until one is clicked, to the first channel here whose transcript is on that dashboard: with a single transcript up, that one. A send never goes to a channel the dashboard is not showing. Only channels the account has joined are listed; join one in Slack first. Each channel is read on its own schedule, all of them together kept inside Slack's rate limit."
    },
    "Sending": {
      "toggle": "sendEnabled",
@@ -49,7 +49,7 @@
      "default": [],
      "group": "Channels",
      "optionsRoute": "/channels",
-      "help": "One transcript tile per channel; the first one is where sends go until a transcript is clicked. Only channels the account has joined are listed — join one in Slack first."
+      "help": "One transcript tile per channel; until a transcript is clicked, sends go to the first channel here that the dashboard is actually showing. Only channels the account has joined are listed — join one in Slack first."
    },
    "pollSeconds": {
      "type": "number",
@@ -1,6 +1,6 @@
 {
  "name": "proddash",
-  "version": "1.6.0",
+  "version": "1.7.0",
  "private": true,
  "description": "Modular production dashboard for Waters Church \u2014 zero-dependency Node server + vanilla client",
  "license": "UNLICENSED",
@@ -451,6 +451,36 @@ a.btn { text-decoration: none; }
 /* one swatch per preset: a miniature dashboard (page, a tile on it, the
   accent as a status dot) and the name; the current one wears the accent */
 /* ── a collapsible admin section ─────────────────────────────────────
   The pattern for any section of this page that folds. The markup is a
   <details class="admin-fold"> holding the section's contents, headed by a
   <summary class="admin-h1 admin-fold-title">: the title keeps the same
   type as every other section heading — a <summary> would otherwise come
   out at the normal weight — and the caret follows the words, so a folded
   section still reads as a heading first. The whole row is the hit target. */
 details.admin-fold > summary.admin-fold-title {
  cursor: pointer;
  list-style: none;
  display: flex;
  align-items: center;
  gap: 8px;
  font-weight: 700; /* matches h1.admin-h1; summary defaults to normal */
  user-select: none;
 }
 details.admin-fold > summary.admin-fold-title::-webkit-details-marker { display: none; }
 /* after the title, not before it — the heading reads first, the caret says
   there is more behind it */
 details.admin-fold > summary.admin-fold-title::after {
  content: "";
  width: 0; height: 0;
  border-left: 6px solid var(--muted);
  border-top: 5px solid transparent;
  border-bottom: 5px solid transparent;
  transition: transform 0.15s;
 }
 details.admin-fold[open] > summary.admin-fold-title::after { transform: rotate(90deg); }
 details.admin-fold > summary.admin-fold-title:hover { color: var(--accent); }
 .theme-swatches {
  display: grid;
  grid-template-columns: repeat(auto-fill, minmax(116px, 1fr));
@@ -512,3 +542,41 @@ a.btn { text-decoration: none; }
  color: var(--accent);
 }
 #theme-status { margin-top: 4px; }
 /* ── the admin PIN ── */
 /* Digits, evenly spaced, so six of them read as a PIN rather than a word. */
 .pin-input {
  font-variant-numeric: tabular-nums;
  letter-spacing: 0.35em;
  text-align: center;
  max-width: 9em;
 }
 .pin-form {
  display: flex;
  flex-wrap: wrap;
  align-items: flex-end;
  gap: 12px;
 }
 .pin-field {
  display: flex;
  flex-direction: column;
  gap: 4px;
  font-size: 12px;
  color: var(--muted);
 }
 .pin-field[hidden] { display: none; }
 .pin-field input {
  padding: 8px 10px;
  font-size: 14px;
  color: var(--text);
  background: var(--bg);
  border: 1px solid var(--border);
  border-radius: 7px;
 }
 .pin-field input:focus { outline: none; border-color: var(--accent); }
 .pin-actions {
  display: flex;
  gap: 8px;
  margin-left: auto;
 }
@@ -2,8 +2,10 @@
   Everything here is server-wide: module enable/disable and admin config
   (written to config/modules.json, module re-inited on save), plus named
-   layout management. Guarded by the shared passcode when one is set. */
+   layout management. Behind the admin PIN when one is set — a shell setting of
   its own, nothing to do with a module's PIN (Slack's send PIN, say). */
 const securitySection = document.getElementById('security-section');
 const loginCard = document.getElementById('login-card');
 const loginStatus = document.getElementById('login-status');
 const passcodeInput = document.getElementById('passcode');
@@ -62,20 +64,30 @@ function showLogin() {
  layoutsSection.hidden = true;
  updateCard.hidden = true;
  themeSection.hidden = true;
  securitySection.hidden = true;
  passcodeInput.value = '';
  passcodeInput.focus();
 }
 let loggingIn = false;
 async function login() {
  if (loggingIn) return;
  loggingIn = true;
  loginStatus.textContent = '';
  loginStatus.className = 'admin-status';
  try {
-    await api('/api/admin/login', { method: 'POST', body: JSON.stringify({ passcode: passcodeInput.value }) });
+    await api('/api/admin/login', { method: 'POST', body: JSON.stringify({ pin: passcodeInput.value }) });
    passcodeInput.value = '';
    loginCard.hidden = true;
    await loadState();
  } catch (e) {
    passcodeInput.value = '';
    loginStatus.textContent = e.message;
    loginStatus.className = 'admin-status error';
    passcodeInput.focus();
  } finally {
    loggingIn = false;
  }
 }
@@ -83,6 +95,82 @@ document.getElementById('login-btn').addEventListener('click', login);
 passcodeInput.addEventListener('keydown', (e) => {
  if (e.key === 'Enter') login();
 });
 // Six digits is the whole PIN, so there is nothing left to press.
 passcodeInput.addEventListener('input', () => {
  passcodeInput.value = passcodeInput.value.replace(/\D/g, '').slice(0, 6);
  if (passcodeInput.value.length === 6) login();
 });
 /* ── the admin PIN ───────────────────────────────────────────────────── */
 const pinCurrentField = document.getElementById('pin-current-field');
 const pinCurrent = document.getElementById('pin-current');
 const pinNew = document.getElementById('pin-new');
 const pinRepeat = document.getElementById('pin-repeat');
 const pinSaveBtn = document.getElementById('pin-save');
 const pinClearBtn = document.getElementById('pin-clear');
 const pinStatus = document.getElementById('pin-status');
 const pinStateEl = document.getElementById('pin-state');
 for (const input of [pinCurrent, pinNew, pinRepeat]) {
  input.addEventListener('input', () => {
    input.value = input.value.replace(/\D/g, '').slice(0, 6);
  });
 }
 /** Paint the section for "no PIN yet" or "one is set". */
 function renderPin(state) {
  const set = Boolean(state.pinSet);
  const fromEnv = Boolean(state.pinFromEnv);
  securitySection.hidden = false;
  pinCurrentField.hidden = !set;
  pinClearBtn.hidden = !set;
  document.getElementById('pin-new-label').textContent = set ? 'New PIN' : 'PIN';
  pinSaveBtn.textContent = set ? 'Change PIN' : 'Set PIN';
  pinStateEl.textContent = fromEnv
    ? 'A passcode is set in this server’s environment (PRODDASH_PASSCODE) and takes precedence. Anything set here applies once that is removed.'
    : set
      ? 'Admin is locked. This page asks for the PIN, and so does every admin request.'
      : 'Admin is open to anyone on the network. Set a 6-digit PIN to lock it.';
 }
 function pinMessage(text, bad = false) {
  pinStatus.textContent = text;
  pinStatus.className = 'admin-status' + (bad ? ' error' : ' ok');
 }
 async function savePin(clearing = false) {
  pinStatus.textContent = '';
  pinStatus.className = 'admin-status';
  const current = pinCurrent.value;
  const next = clearing ? '' : pinNew.value;
  if (!clearing) {
    if (!/^\d{6}$/.test(next)) return pinMessage('The PIN must be exactly 6 digits.', true);
    if (next !== pinRepeat.value) return pinMessage('The two PINs are not the same.', true);
  }
  if (!pinCurrentField.hidden && !/^\d{6}$/.test(current)) {
    return pinMessage('Enter the current PIN to change it.', true);
  }
  pinSaveBtn.disabled = true;
  pinClearBtn.disabled = true;
  try {
    const body = await api('/api/admin/pin', { method: 'POST', body: JSON.stringify({ pin: next, current }) });
    for (const i of [pinCurrent, pinNew, pinRepeat]) i.value = '';
    pinMessage(body.pinSet ? 'PIN saved. It is asked for from the next visit.' : 'PIN removed — admin is open again.');
    await loadState();
  } catch (e) {
    pinMessage(e.message, true);
  } finally {
    pinSaveBtn.disabled = false;
    pinClearBtn.disabled = false;
  }
 }
 pinSaveBtn.addEventListener('click', () => savePin(false));
 pinClearBtn.addEventListener('click', () => {
  if (confirm('Turn the admin PIN off? Anyone on the network could then change this server’s settings.')) savePin(true);
 });
 pinRepeat.addEventListener('keydown', (e) => { if (e.key === 'Enter') savePin(false); });
 /* ── module cards ───────────────────────────────────────────────────── */
@@ -856,6 +944,7 @@ async function loadState() {
  for (const mod of state.modules || []) {
    modulesList.appendChild(buildModuleCard(mod));
  }
  renderPin(state);
  loadTheme();
  loadLayouts();
  loadCatalog(false);
@@ -18,10 +18,11 @@
  <main id="admin-main">
    <section class="admin-card" id="login-card" hidden>
-      <h2>Admin passcode</h2>
+      <h2>Admin PIN</h2>
      <p class="admin-copy">This page changes the server-wide configuration for every dashboard in the building.</p>
      <div class="login-row">
-        <input type="password" id="passcode" placeholder="Passcode" autocomplete="current-password">
+        <input type="password" id="passcode" class="pin-input" inputmode="numeric" autocomplete="off"
               maxlength="6" placeholder="••••••" aria-label="Admin PIN">
        <button class="btn primary" id="login-btn">Unlock</button>
      </div>
      <div class="admin-status" id="login-status"></div>
@@ -40,9 +41,11 @@
    </section>
    <section id="theme-section" hidden>
-      <h1 class="admin-h1">Theme</h1>
+      <details class="admin-fold">
-      <div class="theme-swatches" id="theme-swatches" role="radiogroup" aria-label="Theme"></div>
+        <summary class="admin-h1 admin-fold-title">Theme</summary>
-      <div class="admin-status" id="theme-status"></div>
+        <div class="theme-swatches" id="theme-swatches" role="radiogroup" aria-label="Theme"></div>
        <div class="admin-status" id="theme-status"></div>
      </details>
    </section>
    <section id="modules-section" hidden>
@@ -65,6 +68,35 @@
      <h1 class="admin-h1">Saved layouts</h1>
      <div id="layouts-list"></div>
    </section>
    <section id="security-section" hidden>
      <h1 class="admin-h1">Admin PIN</h1>
      <p class="admin-copy" id="pin-state"></p>
      <div class="admin-card">
        <div class="pin-form">
          <label class="pin-field" id="pin-current-field" hidden>
            <span>Current PIN</span>
            <input type="password" id="pin-current" class="pin-input" inputmode="numeric"
                   autocomplete="off" maxlength="6" placeholder="••••••">
          </label>
          <label class="pin-field">
            <span id="pin-new-label">New PIN</span>
            <input type="password" id="pin-new" class="pin-input" inputmode="numeric"
                   autocomplete="off" maxlength="6" placeholder="6 digits">
          </label>
          <label class="pin-field">
            <span>Repeat</span>
            <input type="password" id="pin-repeat" class="pin-input" inputmode="numeric"
                   autocomplete="off" maxlength="6" placeholder="6 digits">
          </label>
          <div class="pin-actions">
            <button class="btn primary" id="pin-save">Set PIN</button>
            <button class="btn" id="pin-clear" hidden>Turn off</button>
          </div>
        </div>
        <div class="admin-status" id="pin-status"></div>
      </div>
    </section>
  </main>
  <div id="toast" hidden></div>
@@ -941,8 +941,10 @@ body.fullscreen #grid { padding-bottom: 0; }
   every shell element follows, and a colour a tile is configured with (set
   on the tile itself) still wins. The :root block at the top of this file is
   "booth", the default; the list of ids and names lives in server.js
-   (GET /api/theme). All four are booth-grade: high contrast, the accent
+   (GET /api/theme). Every one is booth-grade: high contrast, the accent
-   nowhere near the danger red or the warning amber, muted still readable. */
+   nowhere near the danger red or the warning amber, muted still readable.
   Each sets --accent-text too when the default (a near-black green, for
   booth's mint) would look wrong against its own accent. */
 /* Harbor — deep navy, cyan accent */
 html[data-theme="harbor"] {
@@ -993,3 +995,100 @@ html[data-theme="daylight"] {
  --danger: #d1242f;
  --warn: #b26a00;
 }
 /* Midnight — indigo night, violet accent */
 html[data-theme="midnight"] {
  --bg: #0a0b18;
  --panel: #14162b;
  --border: #272a4a;
  --text: #e8e9fb;
  --muted: #9a9cc8;
  --accent: #9d8cff;
  --accent-text: #12103a;
  --danger: #ff5a72;
  --warn: #f5b93a;
 }
 /* Moss — forest floor, lime accent (warn pushed orange so the two greens
   and the amber never read as one another) */
 html[data-theme="moss"] {
  --bg: #08120c;
  --panel: #101e15;
  --border: #1f3728;
  --text: #e9f4ea;
  --muted: #8fb09a;
  --accent: #8fdb3f;
  --accent-text: #15250a;
  --danger: #ff5a52;
  --warn: #ff9f1c;
 }
 /* Plum — aubergine, purple accent */
 html[data-theme="plum"] {
  --bg: #110a17;
  --panel: #1d1228;
  --border: #332042;
  --text: #f2e9f8;
  --muted: #b195c2;
  --accent: #c084fc;
  --accent-text: #260a37;
  --danger: #ff4d4f;
  --warn: #f7b53b;
 }
 /* Sepia — warm brown room, cool teal accent: the opposite arrangement to
   Ember, which is warm throughout */
 html[data-theme="sepia"] {
  --bg: #12100b;
  --panel: #1d1913;
  --border: #33291d;
  --text: #f4ede0;
  --muted: #b3a48b;
  --accent: #5eead4;
  --accent-text: #06231e;
  --danger: #ff5a52;
  --warn: #ffc247;
 }
 /* Blackout — true black for a dark room, where any glow off the screen
   carries; everything else is as bright as it can be against it */
 html[data-theme="blackout"] {
  --bg: #000000;
  --panel: #0a0a0a;
  --border: #1f1f1f;
  --text: #ffffff;
  --muted: #9e9e9e;
  --accent: #00e5ff;
  --accent-text: #00212a;
  --danger: #ff3b30;
  --warn: #ffcc00;
 }
 /* Paper — the warm light one, next to Daylight's cool white. Danger and warn
   darken, as they must on a light background, and the indigo accent takes
   white text. */
 html[data-theme="paper"] {
  --bg: #f5f1e8;
  --panel: #fffdf8;
  --border: #ddd5c4;
  --text: #1c1a15;
  --muted: #6b6455;
  --accent: #4f46e5;
  --accent-text: #ffffff;
  --danger: #c8102e;
  --warn: #9a6700;
 }
 /* Iron — no colour of its own: the accent is near-white, so the only hues on
   screen are a module's own and the red/amber that mean something */
 html[data-theme="iron"] {
  --bg: #0c0c0d;
  --panel: #161617;
  --border: #2b2b2d;
  --text: #f2f2f3;
  --muted: #9a9a9d;
  --accent: #d8d8dc;
  --accent-text: #131314;
  --danger: #ff4d4f;
  --warn: #ffb224;
 }
@@ -12,7 +12,8 @@
 * Configure via config/proddash.json (defaults, in the repo), an optional
 * proddash.json in the data directory (this machine's overrides), or env vars:
 *   PORT               (default: value in proddash.json, else 24500)
- *   PRODDASH_PASSCODE  (overrides adminPasscode in proddash.json)
+ *   PRODDASH_PASSCODE  (a passcode that overrides the stored admin PIN —
 *                       also the way back in if the PIN is ever forgotten)
 *   PRODDASH_FORGE     (overrides `forge`: "github", or a Gitea/Forgejo base
 *                       URL such as http://10.3.8.90:3000)
 *   PRODDASH_DATA_DIR  (where module config + layouts are kept; see below)
@@ -711,6 +712,13 @@ const THEMES = [
  { id: 'graphite', name: 'Graphite', colors: { bg: '#0f1012', panel: '#17191d', accent: '#6cb4ff' } },
  { id: 'ember',    name: 'Ember',    colors: { bg: '#120c0a', panel: '#1d1411', accent: '#ff8f3a' } },
  { id: 'daylight', name: 'Daylight', colors: { bg: '#eef1f5', panel: '#ffffff', accent: '#0b8a5f' } },
  { id: 'midnight', name: 'Midnight', colors: { bg: '#0a0b18', panel: '#14162b', accent: '#9d8cff' } },
  { id: 'moss',     name: 'Moss',     colors: { bg: '#08120c', panel: '#101e15', accent: '#8fdb3f' } },
  { id: 'plum',     name: 'Plum',     colors: { bg: '#110a17', panel: '#1d1228', accent: '#c084fc' } },
  { id: 'sepia',    name: 'Sepia',    colors: { bg: '#12100b', panel: '#1d1913', accent: '#5eead4' } },
  { id: 'blackout', name: 'Blackout', colors: { bg: '#000000', panel: '#0a0a0a', accent: '#00e5ff' } },
  { id: 'paper',    name: 'Paper',    colors: { bg: '#f5f1e8', panel: '#fffdf8', accent: '#4f46e5' } },
  { id: 'iron',     name: 'Iron',     colors: { bg: '#0c0c0d', panel: '#161617', accent: '#d8d8dc' } },
 ];
 const DEFAULT_THEME = THEMES[0].id;
@@ -1096,12 +1104,13 @@ function uninstallModule(id) {
 /* — updating the shell itself — */
-function copyTree(src, dst) {
+function copyTree(src, dst, include = null) {
  fs.mkdirSync(dst, { recursive: true });
  for (const e of fs.readdirSync(src, { withFileTypes: true })) {
    if (include && !include(e.name)) continue;
    const s = path.join(src, e.name);
    const d = path.join(dst, e.name);
-    if (e.isDirectory()) copyTree(s, d);
+    if (e.isDirectory()) copyTree(s, d, include);
    else fs.copyFileSync(s, d);
  }
 }
@@ -1121,25 +1130,83 @@ async function updateShell() {
    const out = git(['pull', '--ff-only', 'origin', REPO.branch], 120000);
    console.log('[proddash] git pull:', out.split('\n').filter(Boolean).slice(-2).join(' | '));
  } else {
    const keep = (rel) => rel === 'config/modules.json' || rel.startsWith('config/layouts/') || rel.startsWith('.git/');
    const staging = path.join(ROOT, '.proddash-update');
    fs.rmSync(staging, { recursive: true, force: true });
    for (const [rel, data] of remote.files) {
-      if (!safeRelPath(rel) || keep(rel)) continue;
+      if (!safeRelPath(rel) || isKeptOnUpdate(rel)) continue;
      const target = path.join(staging, rel);
      fs.mkdirSync(path.dirname(target), { recursive: true });
      fs.writeFileSync(target, data);
    }
-    if (!fs.existsSync(path.join(staging, 'server.js'))) {
+    const newServer = path.join(staging, 'server.js');
    if (!fs.existsSync(newServer)) {
      fs.rmSync(staging, { recursive: true, force: true });
      throw httpError(502, 'The downloaded archive does not look like ProdDash (no server.js).');
    }
    // Nothing is swapped in until the new server at least parses. A file that
    // arrived truncated or mangled would otherwise be found only by a process
    // that cannot start — the one state this app cannot talk its way out of.
    try {
      execFileSync(process.execPath, ['--check', newServer], { timeout: 30000, stdio: ['ignore', 'ignore', 'pipe'] });
    } catch (err) {
      fs.rmSync(staging, { recursive: true, force: true });
      // node --check leads with the staging path and a caret diagram; the
      // line that names the fault is the one worth repeating.
      const lines = String(err?.stderr || err?.message || err).split('\n').map((l) => l.trim());
      const why = lines.find((l) => /^[A-Za-z]*Error\b/.test(l)) || 'it does not parse';
      throw httpError(502, `The downloaded ProdDash will not run — nothing was changed (${why}).`);
    }
    keepPreviousCopy();
    copyTree(staging, ROOT);
    fs.rmSync(staging, { recursive: true, force: true });
  }
  return { from: SHELL_VERSION, to: remote.version || '', method: status.method };
 }
 /* ── what an update must not touch ───────────────────────────────────
   Anything inside the data directory. Normally it sits well outside the app
   folder and none of this applies, but when it cannot (an unwritable
   Application Support, or PRODDASH_DATA_DIR aimed inside the app) the data
   directory IS the app's config/ — and an update would then write the repo's
   shipped defaults over this machine's own proddash.json, taking the admin
   PIN, the theme and the forge with it. The two legacy names stay listed for
   an install whose state never moved out. */
 const DATA_DIR_INSIDE_ROOT = (() => {
  const rel = path.relative(ROOT, DATA_DIR);
  if (!rel || rel.startsWith('..') || path.isAbsolute(rel)) return '';
  return rel.split(path.sep).join('/') + '/';
 })();
 function isKeptOnUpdate(rel) {
  if (rel.startsWith('.git/')) return true;
  if (rel === 'config/modules.json' || rel.startsWith('config/layouts/')) return true;
  return Boolean(DATA_DIR_INSIDE_ROOT) && `${rel}/`.startsWith(DATA_DIR_INSIDE_ROOT);
 }
 /* ── the way back ────────────────────────────────────────────────────
   The copy being replaced is set aside first, so there is always one known
   version to return to. The launcher restores it if the new one will not
   stay up (see ServerController); by hand it is a rename. It is replaced by
   the next update, never accumulated. */
 function previousCopyPath() {
  return `${ROOT}.previous`;
 }
 function keepPreviousCopy() {
  const previous = previousCopyPath();
  try {
    fs.rmSync(previous, { recursive: true, force: true });
    copyTree(ROOT, previous, (rel) => rel !== '.proddash-update' && rel !== '.git');
    fs.writeFileSync(path.join(previous, '.proddash-version'), SHELL_VERSION);
    console.log(`[proddash] kept ${SHELL_VERSION} at ${previous} in case the new one will not run`);
  } catch (err) {
    // Worth saying, not worth refusing the update over.
    console.warn('[proddash] could not set the current copy aside:', err?.message || err);
  }
 }
 /**
 * Exit so the new code runs. Exit code 75 tells a launcher loop to start us
 * again; when nothing is supervising (PRODDASH_LAUNCHER unset) we start our
@@ -1170,12 +1237,109 @@ function restartServer(reason) {
 /* ── admin API ──────────────────────────────────────────────────────── */
 /* Admin is behind a 6-digit PIN, set in the admin page and kept in this
   machine's proddash.json as a scrypt hash — never in the clear, because that
   file gets copied between machines. A dashboard needs no PIN; only /admin
   and the admin API do. Two ways back in if it is ever forgotten: set
   PRODDASH_PASSCODE in the environment, or delete "adminPin" from
   proddash.json in the data directory and restart. `adminPasscode` (the older
   free-text setting) still works so an existing install keeps running. */
 const PIN_RE = /^\d{6}$/;
 const PIN_MAX_WRONG = 5;
 const PIN_LOCKOUT_MS = 30000;
 const ADMIN_PASSCODE = String(process.env.PRODDASH_PASSCODE || shellConfig.adminPasscode || '');
-/** Session token: regenerating it every boot is fine — admins just re-enter the passcode. */
+/** Session token: regenerating it every boot is fine — admins just re-enter the PIN. */
 const adminToken = crypto.randomBytes(24).toString('hex');
 /** The stored PIN, as "scrypt$<salt>$<hash>"; '' when admin is open. */
 let adminPinHash = String(shellConfig.adminPin || '');
 const pinAttempts = new Map(); // ip → { count, lockedUntil }
 function hashPin(pin, salt = crypto.randomBytes(16).toString('hex')) {
  return `scrypt$${salt}$${crypto.scryptSync(String(pin), salt, 32).toString('hex')}`;
 }
 /** Constant-time check of a PIN against the stored hash. */
 function pinMatches(given, stored) {
  const parts = String(stored || '').split('$');
  if (parts.length !== 3 || parts[0] !== 'scrypt') return false;
  const expected = Buffer.from(parts[2], 'hex');
  const actual = crypto.scryptSync(String(given), parts[1], expected.length);
  return expected.length === actual.length && crypto.timingSafeEqual(expected, actual);
 }
 /** Is a credential required at all? */
 function adminLocked() {
  return Boolean(ADMIN_PASSCODE || adminPinHash);
 }
 /** True when `given` is the credential in force (the env passcode, or the PIN). */
 function credentialOk(given) {
  const s = String(given ?? '');
  if (!s) return false;
  if (ADMIN_PASSCODE) {
    const a = Buffer.from(s);
    const b = Buffer.from(ADMIN_PASSCODE);
    if (a.length === b.length && crypto.timingSafeEqual(a, b)) return true;
  }
  return adminPinHash ? pinMatches(s, adminPinHash) : false;
 }
 function clientIp(req) {
  return String(req.socket?.remoteAddress || 'unknown');
 }
 /** Seconds of lockout left for this address, or 0. */
 function lockoutLeft(ip) {
  const a = pinAttempts.get(ip);
  if (!a || !a.lockedUntil) return 0;
  const left = a.lockedUntil - Date.now();
  if (left <= 0) {
    pinAttempts.delete(ip);
    return 0;
  }
  return Math.ceil(left / 1000);
 }
 function noteWrongPin(ip) {
  const a = pinAttempts.get(ip) || { count: 0, lockedUntil: 0 };
  a.count += 1;
  if (a.count >= PIN_MAX_WRONG) {
    a.count = 0;
    a.lockedUntil = Date.now() + PIN_LOCKOUT_MS;
    console.warn(`[proddash] ${PIN_MAX_WRONG} wrong admin PINs from ${ip} — locked out for ${PIN_LOCKOUT_MS / 1000} s`);
  }
  pinAttempts.set(ip, a);
 }
 /**
 * Store a new PIN (6 digits), or '' to open admin up again. Keeps every other
 * key in this machine's proddash.json. Throws an httpError the route reports.
 */
 function setAdminPin(pin) {
  const next = String(pin ?? '');
  if (next && !PIN_RE.test(next)) throw httpError(400, 'The PIN must be exactly 6 digits.');
  const file = path.join(DATA_DIR, 'proddash.json');
  let existing = {};
  if (fs.existsSync(file)) {
    existing = readJson(file, null);
    if (!existing || typeof existing !== 'object' || Array.isArray(existing)) {
      throw httpError(500, `${file} is not a JSON object — fix it by hand before changing the PIN.`);
    }
  }
  const hash = next ? hashPin(next) : '';
  const out = { ...existing };
  if (hash) out.adminPin = hash;
  else delete out.adminPin;
  writeJson(file, out);
  adminPinHash = hash;
  shellConfig.adminPin = hash;
  pinAttempts.clear();
  console.log(`[proddash] admin PIN ${hash ? 'set' : 'removed — admin is open again'}`);
  return { pinSet: Boolean(hash) };
 }
 function isAuthed(req) {
-  if (!ADMIN_PASSCODE) return true;
+  if (!adminLocked()) return true;
  const cookies = String(req.headers.cookie || '');
  return cookies.split(';').some((c) => c.trim() === 'proddash_admin=' + adminToken);
 }
@@ -1183,7 +1347,7 @@ function isAuthed(req) {
 /** Guard a state-changing admin route. Returns true when the request was refused. */
 function refuseAdminWrite(req, res) {
  if (!isAuthed(req)) {
-    sendJson(res, 401, { error: 'Enter the admin passcode first.', authRequired: true });
+    sendJson(res, 401, { error: 'Enter the admin PIN first.', authRequired: true });
    return true;
  }
  // Requiring application/json forces a CORS preflight that a hostile page
@@ -1268,10 +1432,19 @@ async function handleAdminApi(req, res, urlPath) {
    } catch {
      return sendJson(res, 400, { error: 'Malformed request.' });
    }
-    if (!ADMIN_PASSCODE) return sendJson(res, 200, { ok: true, authRequired: false });
+    if (!adminLocked()) return sendJson(res, 200, { ok: true, authRequired: false });
-    if (String(body.passcode || '') !== ADMIN_PASSCODE) {
+    const ip = clientIp(req);
-      return sendJson(res, 403, { error: 'Wrong passcode.' });
+    const left = lockoutLeft(ip);
    if (left) return sendJson(res, 429, { error: `Too many wrong PINs — try again in ${left} s.`, retryAfter: left });
    // `passcode` is what the older admin page sent; `pin` is what this one does.
    if (!credentialOk(body.pin ?? body.passcode)) {
      noteWrongPin(ip);
      const now = lockoutLeft(ip);
      return sendJson(res, 403, now
        ? { error: `Too many wrong PINs — try again in ${now} s.`, retryAfter: now }
        : { error: 'Wrong PIN.' });
    }
    pinAttempts.delete(ip);
    res.writeHead(200, {
      'Content-Type': 'application/json; charset=utf-8',
      'Set-Cookie': `proddash_admin=${adminToken}; Path=/; SameSite=Lax; HttpOnly`,
@@ -1280,12 +1453,50 @@ async function handleAdminApi(req, res, urlPath) {
    return res.end(JSON.stringify({ ok: true }));
  }
  if (urlPath === '/api/admin/pin' && req.method === 'POST') {
    if (refuseAdminWrite(req, res)) return;
    let body = {};
    try {
      body = JSON.parse((await readBody(req)) || '{}');
    } catch {
      return sendJson(res, 400, { error: 'Malformed request.' });
    }
    // Changing a credential re-asserts it, so a browser left open on the
    // admin page can't be used to take the machine over.
    if (adminPinHash) {
      const ip = clientIp(req);
      const left = lockoutLeft(ip);
      if (left) return sendJson(res, 429, { error: `Too many wrong PINs — try again in ${left} s.`, retryAfter: left });
      if (!pinMatches(String(body.current ?? ''), adminPinHash)) {
        noteWrongPin(ip);
        return sendJson(res, 403, { error: 'That is not the current PIN.' });
      }
      pinAttempts.delete(ip);
    }
    try {
      const result = setAdminPin(body.pin);
      // Whoever just set it has proved they are allowed, so hand them the
      // session rather than bouncing them to the unlock card they just built.
      res.writeHead(200, {
        'Content-Type': 'application/json; charset=utf-8',
        'Set-Cookie': `proddash_admin=${adminToken}; Path=/; SameSite=Lax; HttpOnly`,
        'Cache-Control': 'no-store',
      });
      return res.end(JSON.stringify(result));
    } catch (err) {
      return sendJson(res, err.status || 500, { error: err.message || 'Could not save the PIN.' });
    }
  }
  if (urlPath === '/api/admin/state' && req.method === 'GET') {
    if (!isAuthed(req)) {
      return sendJson(res, 401, { authRequired: true, authed: false });
    }
    return sendJson(res, 200, {
-      authRequired: Boolean(ADMIN_PASSCODE),
+      authRequired: adminLocked(),
      // The env passcode can't be changed from here; the page says so.
      pinSet: Boolean(adminPinHash),
      pinFromEnv: Boolean(ADMIN_PASSCODE),
      authed: true,
      version: SHELL_VERSION,
      dataDir: DATA_DIR,
@@ -1481,7 +1692,7 @@ async function handleLayoutsApi(req, res, urlPath) {
  }
  if (!m[2] && req.method === 'DELETE') {
-    if (!isAuthed(req)) return sendJson(res, 401, { error: 'Enter the admin passcode first.', authRequired: true });
+    if (!isAuthed(req)) return sendJson(res, 401, { error: 'Enter the admin PIN first.', authRequired: true });
    try {
      fs.unlinkSync(layoutPath(name));
    } catch {
@@ -1766,6 +1977,22 @@ server.on('error', (err) => {
 server.listen(PORT, '0.0.0.0');
 /* An update proves itself by staying up. Once this version has, the copy it
   replaced is dropped — so `app.previous` existing always means "the last
   update has not proven itself yet", which is exactly what the launcher
   should roll back to and nothing more. */
 const UPDATE_PROVEN_AFTER_MS = 90000;
 setTimeout(() => {
  const previous = previousCopyPath();
  if (!fs.existsSync(previous)) return;
  try {
    fs.rmSync(previous, { recursive: true, force: true });
    console.log(`[proddash] ${SHELL_VERSION} has stayed up — dropped the copy it replaced`);
  } catch (err) {
    console.warn('[proddash] could not drop the previous copy:', err?.message || err);
  }
 }, UPDATE_PROVEN_AFTER_MS).unref();
 // Update check: shortly after boot, then every few hours (the admin page
 // shows the result; nothing is installed without someone clicking).
 if (!process.env.PRODDASH_NO_REMOTE_CHECK) {
Author	SHA1	Message	Date
Waters ChurchandClaude Opus 5	12f6e22187	An update that goes wrong is no longer the end of it Two things the audit found, both about the archive path every shipped .app uses. Settings could be wiped. The update kept config/modules.json and config/layouts/ by name, but not config/proddash.json — which holds the admin PIN, the theme and the forge pointer. On an install whose data directory IS the app's own config/ (an unwritable Application Support, or PRODDASH_DATA_DIR aimed inside the app), an update wrote the repo's shipped defaults over it: the theme went, and admin silently unlocked. Nothing inside the data directory is written now, wherever it happens to sit, and the two legacy names stay listed for an install whose state never moved out. A bad update was unrecoverable. No rollback, and a fresh .app would not help: seeding only replaces an older copy, and a broken one carries a higher version — so the fix was deleting a folder nothing told you about. Three changes, in the order they catch things: - The download must parse before anything is swapped in. `node --check` against the new server.js, and a failure is reported with the syntax error and leaves the running copy untouched. - Past that, the copy being replaced is set aside as `app.previous`, and dropped once the new version has stayed up ninety seconds — so that folder existing means "the last update has not proven itself yet", and never anything older. - The launcher, which already gives up after four stops in two minutes, now looks for that folder before it does and puts the old copy back. Once: if the old one will not run either, the update was not the problem. The launcher half only reaches a machine with a new .app; the server half travels by the normal update. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>	2026-09-17 16:16:46 -04:00
michael	5025e12b71	Merge pull request 'Rules for a clean interface, and the modules brought to them' (#9 ) from claude/module-rules into main	2026-09-17 15:52:59 -04:00
michael	3009b39453	Merge pull request 'Twelve themes, and the Theme section folds away' (#8 ) from claude/themes into main	2026-09-17 15:52:24 -04:00
michael	41f64f3a13	Merge pull request 'Admin PIN: the fields say enough' (#7 ) from claude/admin-pin-trim into main	2026-09-17 15:51:34 -04:00
Waters ChurchandClaude Opus 5	12f0b20e5f	Rules for a clean interface, and the modules brought to them Seven rules join the four in the module guide, as rules 5 to 11: no explanatory text in a tile's gear and no label over three words; server-side settings in configSchema only; a tile setting changes that tile alone; hide-toggles ungrouped when there are four or fewer and in a folded "Show" group when there are five or more; title-bar controls are icons with tooltips, never names; anything needing words belongs in the gear; and one control per action, either place but not both. Two passages said the opposite and now say the same thing — "keep labels short and put the explanation there" is scoped to configSchema, and "icon buttons, short labels" becomes icons with no labels at all. CLAUDE.md carries the summary. Then the modules. Nothing here changes a setting key or a default, so saved layouts, named layouts and every tile already on a wall keep working; group names, labels, help and fold state are presentation and are not stored. - pco-plan: sixteen labels cut to three words or fewer ("Tint items by type (song / media / other)" is now "Tint by type"), "Show / hide" renamed "Show" and folded. Its one remaining help line stays by request: the top bar's template needs its separator syntax spelled out, which the variable chips beside it cannot convey, so rule 5 carves out template fields. - propresenter-timers: the "Timers ▾" menu was the only named control left in any title bar. It is a stopwatch icon now, with the count riding alongside it while some timers are hidden — setLabel() writes over the button's contents, so the count needed ProdCom's badge treatment rather than a label. "Show" folds; the Colours help goes. - propresenter-now-next: "Show" folds, in the manifest and in the Now entry's own copy. - prodcom-transcript: "Show channel icons" loses the redundant verb. slack and clock were already compliant and are untouched. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>	2026-09-17 14:22:06 -04:00
Waters ChurchandClaude Opus 5	f72170b4e1	The folding section reads as a heading first Theme's title was coming out at the normal weight — <summary> does not inherit an <h1>'s boldness, so sitting it under .admin-h1 got the size, colour and spacing but not the type. It now matches the other section headings exactly. The caret moved to the right of the words. A marker in front pushes the heading out of line with every other one on the page; behind it, the section still reads as "Theme" first and the caret only says there is more. Written as the pattern rather than as Theme's own styling: any section that folds is a <details class="admin-fold"> headed by a <summary class="admin-h1 admin-fold-title">, and the whole row is the target. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>	2026-09-17 13:22:11 -04:00
Waters ChurchandClaude Opus 5	ea1eac1c28	Twelve themes, and the Theme section folds away Seven more palettes: Midnight (indigo, violet), Moss (forest floor, lime), Plum (aubergine, purple), Sepia (warm brown with a cool teal — Ember's arrangement reversed), Blackout (true black for a dark room, where any glow off the screen carries), Paper (the warm light one, next to Daylight's cool white) and Iron, which has no colour of its own: its accent is near-white, so the only hues on screen are a module's own and the red and amber that mean something. Each holds the line the first five set. Text on panel lands between 14.8:1 and 19.8:1, muted between 5.8:1 and 7.4:1, and every accent clears its own theme's danger red and warning amber by more than Ember already does — the narrowest of the new ones is Moss at 54 degrees of hue, against Ember's 18. The Theme section now starts folded, wearing the same disclosure triangle as a module's config groups. A building picks its palette once and then wants the rest of the page, which was getting further down the screen with every swatch. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>	2026-09-17 13:16:47 -04:00
Waters ChurchandClaude Opus 5	ea8be2ac76	Admin PIN: the fields say enough The paragraph under the PIN fields explained what the PIN covers and how to clear it by hand — and only someone already past the PIN could read it, so the recovery note was never where it was needed. Gone, with the dead style and the element lookup that hung off it. The live line under the heading stays: it is the only thing that says whether admin is locked, and the only warning that a passcode in the server's environment outranks whatever is set here. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>	2026-09-17 13:05:53 -04:00
michael	82e6386c73	Merge pull request 'Shell 1.6.0: bars that tuck away, and every edge resizes' (#6 ) from claude/tile-chrome into main	2026-09-17 12:44:07 -04:00
michael	f5eb611872	Merge pull request 'README: the Slack module joins the list of included modules' (#5 ) from claude/readme-slack-module into main	2026-09-17 12:43:31 -04:00
michael	d52cfcc48e	Merge pull request 'Slack 1.2.1: a clearer Send tile, and a send target you can see' (#4 ) from claude/slack-send-target into main	2026-09-17 12:42:48 -04:00
michael	7d46cfbd8f	Merge pull request 'ProPresenter 1.1.0: a Now tile, and switches for everything on it' (#3 ) from claude/propresenter-now into main	2026-09-17 12:41:53 -04:00
michael	7a5b57dc56	Merge pull request 'Admin sits behind a 6-digit PIN' (#1 ) from claude/admin-pin into main	2026-09-17 12:40:31 -04:00
Waters ChurchandClaude Opus 5	c379025d30	README: the Slack module joins the list Every shipped module had an entry under "Included modules" except Slack, which wasn't mentioned anywhere in the README — so the one module that can send as the campus was also the one nobody could read about. Its entry now sits with the others, in their shape: what it does, the tiles it offers in the ＋ picker (one transcript per configured channel plus the two single send surfaces), its four admin groups and its tile settings — all taken from modules/slack/module.json and client.js. The testing paragraph listed the ProdCom, ProPresenter and PCO mocks but not the Slack one, though CLAUDE.md has documented it all along; it is now there with the SLACK_API_BASE line it needs. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>	2026-09-17 09:10:03 -04:00
Waters ChurchandClaude Opus 5	f0be37796b	Slack 1.2.1: a clearer Send tile, and a send target you can see The line above the message box said "Sending as Apollo Beach → #ops" with a Lock button beside it. The box's own placeholder already reads "Message #ops…" and the title bar already has a Lock, so both went. Quick replies keeps its line: it has no placeholder, so that is the only place its target is named. The bigger thing behind it: until a transcript was clicked, a send went to the first channel in the admin list whether or not that channel was on the dashboard — so a board showing only #ops would quietly aim at #general. The target now falls to the first configured channel whose transcript is actually up, which with a single transcript is that one. Only when the page shows no transcript at all does it fall back to the first configured channel. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>	2026-09-16 19:58:57 -04:00
Waters ChurchandClaude Opus 5	52d700df3d	ProPresenter 1.1.0: a Now tile, and switches for everything on it The ＋ picker now offers the module two ways. "Now / Next" is the card as it was. "Now" is the live item on its own: the gradient comes off the card and fills the tile edge to edge, the border, radius and box go, and the playlist name and live dot float over the colour instead of sitting above it. A wall of them reads as panels of colour rather than cards on a background. Every part of the tile is now a switch in a "Show" group in the gear — playlist, live status, the NOW and NEXT labels, slide count, progress bar, the next list and its item tags. One or two words each, no descriptions. The Now entry carries its own six, since the three Next ones have nothing to act on there. Two things the tile still insists on. Trouble overrides the switches: the top row and the live chip come back the moment the feed drops, whatever is switched off, because a tile that has stopped updating must never look like one with nothing live. And at the Now tile's shortest sizes the floating top row would sit on the title, so below the height it needs it goes — the header dot and the title itself still say what is wrong. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>	2026-09-16 19:39:55 -04:00
Waters ChurchandClaude Opus 5	7690ae1fad	Merge main into the admin PIN branch Both sides added to the same two places — the environment-variable list in server.js and the settings table in the README — because the forge work and the PIN work each documented a new setting. Everything from both is kept. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>	2026-09-16 18:57:27 -04:00
Waters ChurchandClaude Opus 5	6dabd9d8a1	Admin sits behind a 6-digit PIN The passcode machinery existed but could only be set by hand in a config file, so in practice every install left admin open to anyone on the network. It is now a PIN you set from the admin page itself. - Six digits, stored as a scrypt hash in this machine's proddash.json — never in the clear, since that file gets copied between machines. - The unlock card takes the PIN and submits itself on the sixth digit. Five wrong tries from one address locks it out for 30 seconds, and the right PIN is refused during the lockout. - Changing or turning off the PIN asks for the current one, so a browser left open on the admin page cannot be used to take the machine over. Whoever sets it keeps their session rather than being bounced to the card they just built. - This is the shell's own PIN and guards /admin and the admin API only. Dashboards stay open, and it is unrelated to a module's PIN — Slack's 4-8 digit send PIN still guards sending, separately and independently. - Ways back in if it is forgotten: PRODDASH_PASSCODE in the environment (which overrides the PIN), or delete adminPin from proddash.json and restart. Both are in the README and on the page itself. - The older free-text adminPasscode still works, so an existing install keeps running. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>	2026-09-16 10:46:41 -04:00