Skip to content

feat(settings): finish the Applications pane and fix its wire contract #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Adron merged 2 commits into from
Sep 17, 2026
Merged

feat(settings): finish the Applications pane and fix its wire contract #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79b2a6c
feat(settings): finish the Applications pane and fix its wire contract
Adron Sep 16, 2026
21e40bc
Merge dev into feat/app-settings-devices-g17
Adron Sep 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
251 changes: 223 additions & 28 deletions App/Features/Settings/DevicesView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
// DevicesView
//
// Settings ▸ Devices (work-consolidation.md G17) — the machines registered under
// this app's key. Rename a machine, promote one to main workstation (its config
// seeds a brand-new device on first sign-in), or deregister one.
// Settings ▸ Applications (work-consolidation.md G17, GitHub issue #56) — the
// machines registered under this app's key and the settings documents they
// share and pin.
//
// Every action `/help/app-settings` documents lives here: set as main
// workstation, rename, remove, view the shared and per-machine settings, copy a
// machine's settings to shared, and delete the shared settings.
//
// Each confirmation states the *actual* consequence rather than a generic "are
// you sure": removal takes the machine's own settings with it, and copy-to-
// shared replaces rather than merges. Both are irreversible, and neither is
// obvious from the button name.
//
// SwiftUI-only (no AppKit). Consumes only `InterlinedDomain` per Decision 0003.

Expand All @@ -16,6 +25,8 @@ struct DevicesView: View {
@State private var renaming: AppDevice?
@State private var draftName: String = ""
@State private var pendingDeregister: AppDevice?
@State private var pendingCopyToShared: AppDevice?
@State private var confirmingSharedDelete = false

var body: some View {
Group {
Expand All @@ -29,7 +40,8 @@ struct DevicesView: View {
if viewModel == nil {
let model = DevicesViewModel(
service: environment?.appSettings,
currentDeviceID: DeviceIdentity.current()
currentDeviceID: DeviceIdentity.current(),
currentDeviceName: DeviceIdentity.suggestedName
)
viewModel = model
await model.load()
Expand All @@ -41,25 +53,16 @@ struct DevicesView: View {
private func content(_ viewModel: DevicesViewModel) -> some View {
if viewModel.isUnavailable {
SettingsUnavailableView(
title: "Devices unavailable",
message: "Synced settings need an app key registered with InterlinedList before this Mac can appear here."
title: "Applications unavailable",
message: "This build has no app-settings key configured, so this Mac cannot sync settings or appear in the device list."
)
} else {
Form {
if let error = viewModel.error {
Section { SettingsErrorRow(error: error) }
}
Section("Registered devices") {
if viewModel.isLoading && viewModel.devices.isEmpty {
ProgressView()
} else if viewModel.devices.isEmpty {
Text("No devices registered yet.").foregroundStyle(.secondary)
} else {
ForEach(viewModel.devices) { device in
row(device, viewModel: viewModel)
}
}
}
sharedSettingsSection(viewModel)
devicesSection(viewModel)
}
.formStyle(.grouped)
.alert("Rename device", isPresented: Binding(
Expand All @@ -75,19 +78,114 @@ struct DevicesView: View {
Button("Cancel", role: .cancel) { renaming = nil }
}
.confirmationDialog(
"Deregister this device?",
"Remove this machine?",
isPresented: Binding(
get: { pendingDeregister != nil },
set: { if !$0 { pendingDeregister = nil } }
),
presenting: pendingDeregister
) { device in
Button("Deregister", role: .destructive) {
Button("Remove", role: .destructive) {
Task { await viewModel.deregister(device); pendingDeregister = nil }
}
Button("Cancel", role: .cancel) { pendingDeregister = nil }
} message: { device in
Text("\(device.name) will lose its per-machine settings. Shared settings are unaffected.")
// Naming both halves matters: users hesitate to remove an old
// machine for fear of losing the settings they share with it.
Text(
device.isMainWorkstation
? "\(device.name) will lose the settings saved just for it. Shared settings are not affected. Another machine will become the main workstation."
: "\(device.name) will lose the settings saved just for it. Shared settings are not affected."
)
}
.confirmationDialog(
"Replace shared settings?",
isPresented: Binding(
get: { pendingCopyToShared != nil },
set: { if !$0 { pendingCopyToShared = nil } }
),
presenting: pendingCopyToShared
) { device in
Button("Replace", role: .destructive) {
Task { await viewModel.copySettingsToShared(from: device); pendingCopyToShared = nil }
}
Button("Cancel", role: .cancel) { pendingCopyToShared = nil }
} message: { device in
Text("The shared settings will be replaced with the settings from \(device.name). This is not a merge — shared settings that \(device.name) does not have will be removed.")
}
.confirmationDialog(
"Delete shared settings?",
isPresented: $confirmingSharedDelete
) {
Button("Delete", role: .destructive) {
Task { await viewModel.deleteSharedSettings() }
}
Button("Cancel", role: .cancel) {}
} message: {
Text("Every machine loses the settings shared across this account. Settings saved for individual machines are not affected.")
}
.sheet(isPresented: Binding(
get: { viewModel.inspection != nil },
set: { if !$0 { viewModel.dismissInspection() } }
)) {
if let inspection = viewModel.inspection {
DeviceSettingsInspector(inspection: inspection) {
viewModel.dismissInspection()
}
}
}
}
}

// MARK: - Shared settings

@ViewBuilder
private func sharedSettingsSection(_ viewModel: DevicesViewModel) -> some View {
Section("Shared settings") {
if let document = viewModel.sharedDocument {
SettingsDocumentSummary(document: document)
HStack {
Spacer()
if viewModel.busyID == DevicesViewModel.sharedSettingsRowID {
ProgressView().controlSize(.small)
} else {
Button("Delete Shared Settings…", role: .destructive) {
confirmingSharedDelete = true
}
.disabled(viewModel.busyID != nil)
}
}
} else if viewModel.isLoading {
ProgressView()
} else {
// Nothing stored is the ordinary first-run state, not an error.
Text("No settings are shared across this account yet.")
.foregroundStyle(.secondary)
}
}
}

// MARK: - Devices

@ViewBuilder
private func devicesSection(_ viewModel: DevicesViewModel) -> some View {
Section("Registered machines") {
if viewModel.mainWorkstationIsUnknown {
Label(
"Another machine became the main workstation. Reopen this pane to see which.",
systemImage: "questionmark.circle"
)
.font(.callout)
.foregroundStyle(.secondary)
}
if viewModel.isLoading && viewModel.devices.isEmpty {
ProgressView()
} else if viewModel.devices.isEmpty {
Text("No machines registered yet.").foregroundStyle(.secondary)
} else {
ForEach(viewModel.devices) { device in
row(device, viewModel: viewModel)
}
}
}
}
Expand All @@ -104,17 +202,17 @@ struct DevicesView: View {
.padding(.horizontal, 6).padding(.vertical, 2)
.background(.tint.opacity(0.15), in: Capsule())
}
if device.isMainWorkstation {
// Suppressed while the holder is unknown: a stale badge
// asserts something this client can no longer vouch for.
if device.isMainWorkstation && !viewModel.mainWorkstationIsUnknown {
Label("Main", systemImage: "star.fill")
.labelStyle(.titleAndIcon)
.font(.caption2)
.foregroundStyle(.secondary)
}
}
if let lastSeen = device.lastSeenAt {
Text("Last seen \(lastSeen.formatted(.relative(presentation: .named)))")
.font(.caption).foregroundStyle(.secondary)
}
Text(subtitle(for: device))
.font(.caption).foregroundStyle(.secondary)
}
Spacer()
if viewModel.busyID == device.id {
Expand All @@ -123,12 +221,20 @@ struct DevicesView: View {
Menu {
Button("Rename…") { renaming = device; draftName = device.name }
if !device.isMainWorkstation {
Button("Make main workstation") {
Button("Make Main Workstation") {
Task { await viewModel.makeMainWorkstation(device) }
}
}
Divider()
Button("Deregister…", role: .destructive) { pendingDeregister = device }
Button("View Settings…") { Task { await viewModel.inspect(device) } }
// `hasDeviceSettings == nil` means the server did not say,
// so the action stays available rather than being hidden on
// an assumption; the service refuses an empty copy.
if device.hasDeviceSettings != false {
Button("Copy Settings to Shared…") { pendingCopyToShared = device }
}
Divider()
Button("Remove…", role: .destructive) { pendingDeregister = device }
} label: {
Label("Actions", systemImage: "ellipsis.circle")
.labelStyle(.iconOnly)
Expand All @@ -140,7 +246,96 @@ struct DevicesView: View {
}
.accessibilityElement(children: .combine)
.accessibilityLabel(
device.isMainWorkstation ? "\(device.name), main workstation" : device.name
device.isMainWorkstation && !viewModel.mainWorkstationIsUnknown
? "\(device.name), main workstation"
: device.name
)
}

private func subtitle(for device: AppDevice) -> String {
var parts: [String] = []
if let lastSeen = device.lastSeenAt {
parts.append("Last seen \(lastSeen.formatted(.relative(presentation: .named)))")
}
if device.hasDeviceSettings == true {
parts.append("has its own settings")
}
return parts.joined(separator: " · ")
}
}

// MARK: - Settings document presentation

/// Last-updated and size for one settings document.
///
/// Size is shown because the payload is opaque to this app as well as to the
/// server — there is nothing else truthful to say about its contents at a
/// glance, and the server enforces a size cap.
struct SettingsDocumentSummary: View {
let document: AppSettingsDocument

var body: some View {
LabeledContent("Last updated") {
if let updatedAt = document.updatedAt {
Text(updatedAt.formatted(date: .abbreviated, time: .shortened))
} else {
Text("Unknown").foregroundStyle(.secondary)
}
}
LabeledContent("Size") {
Text(document.byteSize.formatted(.byteCount(style: .file)))
}
LabeledContent("Entries") {
Text("\(document.bag.count)")
}
}
}

/// One machine's settings, shown on demand.
struct DeviceSettingsInspector: View {
let inspection: DevicesViewModel.Inspection
let dismiss: () -> Void

var body: some View {
VStack(alignment: .leading, spacing: 12) {
Text(inspection.device.name).font(.headline)

if inspection.isLoading {
ProgressView().frame(maxWidth: .infinity)
} else if let error = inspection.error {
Label(error, systemImage: "exclamationmark.triangle")
.foregroundStyle(.red).font(.callout)
} else if let document = inspection.document {
Form {
Section("Settings saved for this machine") {
SettingsDocumentSummary(document: document)
}
Section("Keys") {
if document.bag.isEmpty {
Text("None").foregroundStyle(.secondary)
} else {
// Keys only, never values: the payload can hold a
// sync folder path and other machine-local detail,
// and this pane is about accounting for settings,
// not displaying them.
ForEach(document.bag.keys, id: \.self) { key in
Text(key).font(.callout.monospaced())
}
}
}
}
.formStyle(.grouped)
} else {
Text("This machine has no settings of its own. It uses the shared settings.")
.foregroundStyle(.secondary)
}

HStack {
Spacer()
Button("Done", action: dismiss).keyboardShortcut(.defaultAction)
}
}
.padding()
.frame(width: 420, height: 380)
}
}
Loading