Settings: one page, one app list, and a hotspot picker that also takes a typed name by nsd97 · Pull Request #104 · krishhgg/Insomnia

nsd97 · 2026-10-12T16:59:22Z

Why

The Settings window was one 520 pt form with about 2,500 pt of content. It showed bundle IDs, SIGSTOP and NSAppSleepDisabled, and a footer that listed about 20 kinds of protected apps. Two "Add running app…" menus sat in different sections and meant opposite things. On a real Mac, Comet went into the freeze list instead of the agent list and was frozen twice during testing. The hotspot name had to be typed, and a straight apostrophe never matches an iPhone's hotspot (#87).

What

One page, grouped by what happens: When the lid closes, Apps, Battery, If Wi-Fi drops, General. It fits without scrolling (490 × 897 pt on macOS 27), and its minimize and maximize buttons are dimmed, as the HIG asks of a settings window. On a shorter screen, such as a 13-inch MacBook Air with the Dock at the bottom, it opens no taller than the screen and the form scrolls. It keeps one width, so a long notice wraps.
Edit Apps, a sheet with one list.
- It shows the listed apps this Mac has, each with its icon and one rule: Keep running or Freeze when lid closes.
- A rule moves the app between agentList and freezeList (Config.setRule), so no app sits on a list the user didn't choose.
- One Add App menu offers the running apps and Choose…. A new app starts as Keep running. Choose… registers the app with Launch Services first, so an app never opened, such as one just unzipped, still gets its row.
- Apple apps and Docker Desktop can't be set to freeze, matching FreezePlanner.isDenied.
- "All other apps" is freezeAllApps, with the "Would freeze now" line. The Docker and App Nap switches moved here, each with a one-line explanation.
If Wi-Fi drops, a sheet.
- The name field suggests networks this Mac has joined (CWConfiguration.networkProfiles, through textInputSuggestions) and still takes any name typed.
- Matching ignores case, accents and the kind of apostrophe, and choosing a suggestion fills in the exact name. So typing Avery's offers Avery’s iPhone, and picking it saves the iPhone's own spelling (Hotspot: an SSID typed with a straight apostrophe never matches an iPhone hotspot #87). Hotspot: look for the SSID with the other apostrophe when the scan finds nothing #101 covers a name typed without picking one, at join time, and the two work together.
- Location access is one row, with Allow… or Open Location Services. The tmux nudge sits in a disclosure group.
- The password loads each time the sheet opens, so an unsaved edit never outlives the sheet.
Cut (every config.json key stays):
- The presets editor. Nothing outside Settings reads presets, so Default session length is now a menu over them.
- The read-only Maximum session and config path rows, the footers, and the bundle IDs.
- The battery steppers, now menus where 0 reads Never.
Code:
- SettingsView.swift went from 628 lines to 233, with AppsSheet, HotspotSheet, RunningApps and a 25-line SessionManager+Settings for the shared bindings.
- The keychain reads behind the password field moved unchanged from the view to HotspotPasswordField.
- SettingsWindow hosts SettingsView directly, without AnyView. It is resizable, with zoom dimmed, only so AppKit can fit it to a short screen, and it refits to the form each time it opens.
- chipLabel lost its last caller and is gone.
Copy:
- Labels say what happens: "Mute audio", "Turn on Low Power Mode", "Protect against overheating", "Open at login".
- The one-time "Lid-close settings changed" notice names the new places.
- README, docs/lid-close.md, docs/extras.md, docs/spec.md and docs/releasing.md follow.

Tests

New:
- SettingsTests: hotspot suggestions with either apostrophe, each network once, case and accents ignored; app summaries; Choose… reading a bundle ID, and listing an app Launch Services hadn't seen; session length labels; the window fitting a screen shorter than the form and keeping its width with the longest notice.
- ConfigTests: app rules (one list per app, no change for the same rule, an app on both lists) and floor choices.
Updated:
- LidCloseCopyTests: the microphone note is now the mute toggle's subtitle.
- The notice copy in ConfigTests and ConfigLoadTests.
- SettingsPasswordNoticeTests and FailoverMachineTests call the moved methods.
Checks on this branch:
- swift test: 1,245 tests, none skipped, and no failures on the third commit. Each earlier full run had one timing failure outside Settings, a different test each time: UIStatusTests.testCollapseReadsTheSessionWhenTheSlotsLeaveNotWhenThePillsStartFolding and RecoveryScriptTests.testUninstallRunsRecoveryUnderItsOwnLockAndKeepsLockInode on the first commit, RecoveryScriptTests.testUninstallUsesTheCheckoutBackstopWhenTheAppDeclaresTheVersion on the second. Each passed when run again, and RecoveryScriptTests passed as a whole (232 tests).
- swift build -c release -Xswiftc -warnings-as-errors
- ShellCheck, and /bin/bash -n plus the bash 4 grep
- scripts/check-lid-simulation-gate.sh
Real Mac: recorded in docs/release-validation.md under October 12, 2026.
- Changing a rule in Edit Apps moved the bundle ID between the two lists in config.json.
- The name field offered networks this Mac has joined, and a typed curly apostrophe was saved byte for byte.
- A scratch copy with 14 extra rows opened 1084 pt tall, the screen's whole visible height, and its form scrolled to the last row. With the two-change notice, the window stayed 490 pt wide and the notice wrapped.
- An app bundle that had never been opened was not found by its bundle ID until Choose…'s registration, and was found after it, under its own name.
- A new "Settings" item is in the release checklist.

Decisions

One page, not toolbar panes. The HIG allows a single-pane settings window ("If your settings window doesn’t have multiple panes, use the title App Name Settings"). With these cuts, every setting fits on one screen, with nothing to click through to find the setting you want. Panes were designed too, as the alternative option below, and are a small change from here if you prefer them.
One app list with a rule per app, instead of two lists, so the wrong-list mistake above can't happen.
Hotspot suggestions use SwiftUI's textInputSuggestions rather than an AppKit combo box.
Resizable, but only in height. AppKit fits a window to a short screen only when it is resizable. The form fixes the width and zoom stays dimmed, so on a normal screen the window still opens at the form's size.

Not covered

On a real Mac: a lid close after a rule change, Choose… through the open panel, the Allow… button in a bundled build, and VoiceOver. Unit tests cover setRule, and FreezerTests covers the planner.
The short screen was simulated with extra rows on a 16-inch MacBook Pro, not tried on a 13-inch Mac.
The hotspot sheet still sizes to its rows. With the tmux section open and many panes, it could pass the bottom of a 13-inch screen.
The hand-drawn docs/assets/lid-actions.svg still shows the old layout.
Menu bar: add Liquid Glass quick actions and native settings #63 also redesigns Settings, as part of a larger change. This PR changes Settings only.
Nine other open PRs also edit SettingsView.swift (Backstop: end a valid session when the app is gone, the battery is below the end floor, or heat is critical #34, Add standalone desktop control center and portable setup #54, Lid close: lock the screen when the lid closes #71, Add opt-in hotspot usage tracking and budget warnings #73, Auto: keep awake for registered agent work #79, Heat: keep Low Power Mode on until nominal, and show it in the menu #80, Heat: end the session after 15 minutes of serious heat, and sleep a closed lid #81, Menu bar: an option to show the eye without the countdown #84, Menu bar: Add Compact and Minimal menu bar modes + UX fixes #96). I'll rebase this one onto whichever lands first.

Screenshots

From a release build on macOS 27.0 with a throwaway config.

Before, upstream main at three scroll positions:

After, light and dark:

Edit Apps and If Wi-Fi drops:

The hotspot picker. Typing Avery's with a straight apostrophe offers both of Avery’s devices. This is the same build, except that the joined-networks list returns sample names so no real network shows:

Alternative option: toolbar panes (mockups, not built). Every setting stays, split into General, Lid Closed, Agent Apps, Battery and Network panes. I built and recommend the one page above instead: the settings people change most are all on one screen, the app lists open in a sheet only when needed, and there's no last-selected pane to restore. If you'd rather have panes, the sections above map one to one:

Sources

HIG, settings windows: fewer settings, defaults that suit most people, dimmed minimize and maximize buttons, and App Name Settings for a window with one pane. Settings
HIG, copy: "Keep settings labels clear and simple", describe what a setting does when on, show hints in text fields. Writing
HIG, typing or picking: a field that also offers a list of likely values. Combo boxes, Text fields
WWDC, labels:
- Name a setting for what it does for people, and say the name out loud. Craft clear names for features and labels in your app
- Remove filler and repetition. Make a big impact with small writing changes
SwiftUI rows:
- A second Text in the label is a subtitle. Toggle, LabeledContent
- Leading labels, trailing controls. GroupedFormStyle
SwiftUI suggestions: textInputSuggestions(_:), textInputCompletion(_:)
SwiftUI sheets and file picking:
- Done goes trailing in a sheet. confirmationAction
- Choose… uses fileImporter(isPresented:allowedContentTypes:onCompletion:)
AppKit, app icons: icon(forFile:), icon(for:)
Core WLAN, joined networks in auto-join order: networkProfiles, CWNetworkProfile.ssid, CWWiFiClient.interface()
Foundation and Swift:
- "30 minutes", "4 hours" come from units(allowed:width:…)
- Matching ignores case and accents via folding(options:locale:)
AppKit, fitting the window to the screen:
- A resizable window taller than the screen is fitted to it. constrainFrameRect(_:to:)
- The hosting controller sets the window's minimum and maximum size from the form. sizingOptions
- Zoom dimmed. standardWindowButton(_:)
Launch Services, apps added with Choose…: LSRegisterURL(::), urlForApplication(withBundleIdentifier:)
Release notes: .roundedBorder is soft-deprecated, so the fields use the form's own style. macOS 27 Release Notes

🤖 Generated with Claude Code

Confidence Score: 5/5

The PR appears safe to merge; no new actionable issues were found.

Summary

Settings becomes one page, with separate sheets for app rules and hotspot setup.

Settings now puts related controls together on one page.
Each listed app gets one rule for when the lid closes.
The hotspot sheet suggests remembered names and accepts typed names.

Diagram

%%{init: {'theme': 'neutral'}}%%
flowchart TD
  Settings[Settings page] --> Apps[Edit Apps sheet]
  Settings --> Hotspot[Hotspot sheet]
  Settings --> Config[Shared Config]
  Apps --> Rules[Config.setRule]
  Rules --> Config
  Hotspot --> Config
  Hotspot --> Keychain[HotspotSecretStore]
  Config --> Saved[config.json]
  Config --> Session[Session services]

_{Reviews (9) · Last reviewed commit: "Merge origin/main into settings-hig" · Reviewed by Greptile}

Greptile's review of krishhgg#104 found two ways to lose a setting. The window was as tall as its form, 896 pt, and not resizable. AppKit fits a window taller than the screen to it only when the window is resizable (constrainFrameRect(_:to:)), so on a 13-inch MacBook Air with the Dock at the bottom, Open at login was below the screen. The window is now resizable with zoom still dimmed, and the form has one width and no fixed height, so it scrolls on a short screen. The window refits to the form each time it opens. The fixed width also stops the one-time lid-close notice from widening the window to 738 pt. Choose… saved the app's bundle ID, but an app Launch Services hasn't seen, such as one just unzipped, has no URL for that ID, so its row was left out and could not be changed or removed. Choose… now registers the app (LSRegisterURL) before reading its ID. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>

…s a typed name The Settings window was one long scrolling form with bundle IDs, SIGSTOP and NSAppSleepDisabled on screen, and two "Add running app" menus that meant opposite things; during testing, Comet landed on the freeze list that way. Settings is now one page that fits without scrolling. Edit Apps keeps one list with a rule per app, so each app sits on exactly one of agentList and freezeList. The hotspot name suggests networks this Mac has joined and still takes a typed name, matching either apostrophe (krishhgg#87). Every config.json key stays. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>

Greptile's review of krishhgg#104 found two ways to lose a setting. The window was as tall as its form, 896 pt, and not resizable. AppKit fits a window taller than the screen to it only when the window is resizable (constrainFrameRect(_:to:)), so on a 13-inch MacBook Air with the Dock at the bottom, Open at login was below the screen. The window is now resizable with zoom still dimmed, and the form has one width and no fixed height, so it scrolls on a short screen. The window refits to the form each time it opens. The fixed width also stops the one-time lid-close notice from widening the window to 738 pt. Choose… saved the app's bundle ID, but an app Launch Services hasn't seen, such as one just unzipped, has no URL for that ID, so its row was left out and could not be changed or removed. Choose… now registers the app (LSRegisterURL) before reading its ID. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>

Greptile's review of 44cb790 found no test for the Launch Services registration Choose… now does: the existing test reads Calculator's bundle ID, which passed before the fix too. testChoosingAnAppLaunchServicesHasNotSeenListsIt builds a stand-in app with a new bundle ID, checks it isn't found by that ID, runs bundleID(ofAppAt:) and checks isInstalled now finds it. Without the LSRegisterURL call the last check fails. Launch Services ignores apps in temporary folders and bundles with no executable, so the stand-in is a copy of /usr/bin/true next to the test bundle. The test unregisters it with lsregister -u and deletes it. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>

krishhgg · 2026-10-17T03:21:25Z

@greptileai please review this PR.

krishhgg · 2026-10-18T01:39:20Z

End-to-end test in a VM on macOS 27.0.1

The one-page Settings, Edit Apps and the hotspot sheet all open, show the current config and close with Done. One thing to look at: an app on both lists in an older config.json shows under both summary lines on the page, while Edit Apps shows it once, as Keep running. That is the case in Greptile's open comment.

Setup

A Tart VM on the maintainer's Mac mini, macOS 27.0.1 (26A434) with Xcode 27.0. Each version was built from source and installed with scripts/install.sh, then driven by a script inside the VM using Accessibility and posted mouse events.

This PR's head (3a13fa0). A stand-in Slack.app (bundle id com.tinyspeck.slackmacgap, registered with Launch Services) gave the VM a third-party app that the default lists name. The script (t104c.sh) opened Settings, clicked Edit Apps… and Set Up… and read the sheets. It closed each sheet with Return, which presses Done. It then put Slack on both agentList and freezeList in config.json, as an older config could have it, added 30 tmux targets, relaunched the app and looked again.

Results

	Result
Settings page	When the lid closes (display, mute audio, Low Power Mode), Apps (Keep running: Terminal; Freeze when lid closes: Slack; Edit Apps…), Battery (40%, 10%, overheating), If Wi-Fi drops (Join an iPhone hotspot, Not set up, Set Up…), then Default session length and Open at login
Edit Apps…	one list: Slack "Freeze when lid closes", Terminal "Keep running"; Add App; All other apps "Keep running"; Docker and App Nap switches; Return closed it
Set Up…	Hotspot name ("Choose or type a name"), Password, Location access, the tmux options under a disclosure row; Return closed it
Slack on both lists	Settings page: "Keep running: Terminal, Slack" and "Freeze when lid closes: Slack". Edit Apps: Slack once, "Keep running"

Settings (the Dock covers the bottom rows):

Edit Apps:

The hotspot sheet:

Slack on both lists, the page and then Edit Apps:

Not covered

Choose… in Add App, typing a hotspot name, and saving a password.
Joining a hotspot. The VM has no Wi-Fi.
The tmux list under the disclosure row. The script's press did not open it (tmux targets shown: 0 in the log).
What a session does at lid close with an app on both lists.
macOS 26 and real hardware.

The full logs are run-full-lab27.log and run-followup2-lab27.log.

🤖 Generated with Claude Code

krishhgg · 2026-10-18T17:21:16Z

Thanks for this. Three things to fix before it can merge.

1. An app on both lists shows two rules

This is the case in Greptile's open thread on SettingsView.swift:88. An older config.json can list one app on both agentList and freezeList. Settings then shows the app under both summary lines, while Edit Apps shows it once, as Keep running, and the freeze planner keeps it running. My VM test above saw exactly this with Slack on both lists.

Picking a rule in Edit Apps doesn't clean it up either. Config.swift:313 returns early when the effective rule is unchanged, so choosing Keep running for that app leaves it on the freeze list.

Fix: in setRule, remove the overlap even when the effective rule stays the same. Build the Settings summary lines from the effective rules (rule(for:)) instead of the raw lists. Add a test for an app on both lists, then resolve Greptile's thread.

2. The hotspot sheet can grow taller than the screen

With many tmux targets, opening the disclosure in HotspotSheet.swift:27 makes the sheet taller than the screen. The vertical fixedSize stops the form from shrinking and scrolling, so the last targets, the Add row and Done can't be reached. In the VM, 30 targets made the sheet 870 points tall, and Done was below the bottom of the screen.

Fix: cap the sheet's height and let the form scroll.

3. The new label tests need an English system

The asserts at SettingsTests.swift:125 expect English text, but lengthLabel formats with the Mac's current locale. On a Mac set to French, for example, these tests fail even though the formatting is right.

Fix: let lengthLabel take a locale, and pass an English one (such as en_US_POSIX) in these tests.

Push the fixes as new commits on this branch (no rebase or force-push). CI, Greptile and the Codex review then run again on the new head. My VM test above covered 3a13fa0, so I'll rerun it on the new head.

🤖 Generated with Claude Code

Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>

The owner's review of krishhgg#104, and Greptile's open thread on SettingsView, found that an app an older config.json names on both agentList and freezeList showed under both summary lines on the Settings page. Edit Apps showed it once, as Keep running, which is what the freeze planner does with it. Picking Keep running didn't clean it up either: setRule returned early when the effective rule was unchanged, so the app stayed on the freeze list. The summaries now come from the effective rules (Config.apps(with:), built on rule(for:)), the same rows Edit Apps shows. setRule takes the app off every list but the one for its rule even when that rule is unchanged, and an app already on the right list keeps its place there. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>

The owner's VM run of krishhgg#104 found that with 30 tmux targets and the tmux disclosure open, the hotspot sheet was 870 pt tall and Done was below the bottom of the screen. The sheet's vertical fixedSize held the form at the height of all its rows, so it could not scroll. Without it, macOS sizes the sheet itself: a sheet's default sizing on macOS fits the content's height, up to a maximum it takes from the height of the window presenting it. In a scratch copy on a 16-inch MacBook Pro, a sheet like this one with 60 rows in a 929 pt window stopped at 857 pt with its bottom on screen, while with fixedSize it was 1084 pt and ran 32 pt off the bottom. Short sheets kept their height: 295 pt collapsed and 596 pt with 12 rows open, either way. testTheHotspotSheetCanBeShorterThanItsRows offers the sheet less height than its rows need and checks it takes no more; with the fixedSize back it fails. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>

The owner's review of krishhgg#104 noted that testSessionLengthsReadAsWords expects English text while lengthLabel formats in the Mac's current locale, so on a Mac set to French it fails ("1 heure") although the formatting is right. lengthLabel takes a locale, Locale.autoupdatingCurrent by default, which is the locale the units style used before, so Settings reads the same. The test passes en_US_POSIX. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>

The release checklist's Settings items now cover an app config.json names on both lists and the hotspot sheet with 30 tmux targets, and docs/spec.md says how Settings treats an app on both lists. The validation record has today's checks of 544b7c9 on a MacBook Pro with macOS 27.0.1: the summaries, the Edit Apps cleanup, and the hotspot sheet's height in a scratch copy with the tmux section open. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>

nsd97 · 2026-10-18T18:28:55Z

Thanks for the VM run. All three are fixed in new commits on this branch, on top of a merge of current main (8134726). There was no rebase and no force-push.

1. An app on both lists shows two rules: `891fd8e`

Summaries: the two lines on the page now come from the effective rules (Config.apps(with:), built on rule(for:)), so Slack on both lists shows once, under Keep running.
setRule: it removes the overlap even when the effective rule stays the same. The app keeps its place on the list it stays on.
Test: ConfigTests.testAnAppOnBothListsHasOneRuleAndPickingEitherCleansItUp fails with summaries built from the raw lists, and with the old early return.
On this Mac: with Slack on both lists, the page read "Keep running: Slack, Terminal" and "Freeze when lid closes: Discord". Choosing Keep running for Slack in Edit Apps left freezeList as ["com.hnc.Discord"]. Greptile's thread is answered and resolved.

2. The hotspot sheet can grow taller than the screen: `5d57192`

Change: the vertical fixedSize is gone, and that alone caps the sheet. On macOS a sheet's default sizing is .form fitted to its content's height, and .form takes its maximum height from the window presenting it. The form scrolls past that.
On this Mac: a scratch copy had the tmux section forced open, because Accessibility couldn't open it here either, and 30 targets. Its sheet opened at 470 × 825 pt inside the 490 × 897 pt Settings window. The form scrolled to agents:30.0 and the Add row, with Done on screen.
Short sheets keep their height: in a probe with and without the fixedSize, a collapsed sheet was 295 pt both ways, and 596 pt both ways with 12 rows open.
Test: SettingsTests.testTheHotspotSheetCanBeShorterThanItsRows fails with the fixedSize back.

3. The label tests need an English system: `544b7c9`

Change: lengthLabel takes a locale, Locale.autoupdatingCurrent by default, which is the locale the units style already used. The test passes en_US_POSIX.
Check: with xctest's own preferences set to fr_FR, the old test failed on "1 heure", "4 heures" and "3 jours", and the new one passed.

Docs and checks

Docs (ac6e05e): release checks for 1 and 2 in docs/releasing.md, a sentence in docs/spec.md, and today's results in docs/release-validation.md.
swift test on ac6e05e: 1,252 tests, none skipped, no failures, on macOS 27.0.1 with Xcode 27.1 and tmux installed.
Release build: swift build -c release -Xswiftc -warnings-as-errors passes.
Scripts: /bin/bash -n on every script, the bash 4 grep and scripts/check-lid-simulation-gate.sh pass.

Sources:

Sheet height: PresentationSizing.automatic, FormPresentationSizing, fixedSize(horizontal:vertical:), sizeThatFits(in:)
Labels: Duration.UnitsFormatStyle.locale(_:), Locale.autoupdatingCurrent
App rules: removeAll(where:)

Greptile's review of ac6e05e found that an older config.json can name an Apple app or Docker Desktop on freezeList alone. Edit Apps then showed "Freeze when lid closes" in a disabled picker, and the summary on the page listed the app under it, though FreezePlanner.isDenied keeps such an app running. rule(for:) now returns what the planner does: Keep running for any listed app it denies (the agent list, Apple apps, Insomnia, Docker Desktop), Freeze otherwise. Edit Apps and the summaries both read it. The row's Remove button already clears the stale entry. In a release build with TextEdit and Docker Desktop on freezeList alone, the page read "Keep running: Terminal, TextEdit, Docker" and "Freeze when lid closes: Discord", both rows read Keep running, and Remove took TextEdit off freezeList. testAppsThePlannerNeverFreezesShowAsKeepRunning fails with the previous rule(for:). Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>

krishhgg · 2026-10-18T23:35:32Z