feat(swift-ios): start a new thread on the same branch#6136

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

Closed
saphid wants to merge 16 commits into from
Closed

feat(swift-ios): start a new thread on the same branch #6136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2f9f976
feat(swiftui): offer undo after settling thread
saphid Aug 11, 2026
c489281
fix(swiftui): confirm destructive thread deletion
saphid Aug 11, 2026
668a513
fix(swiftui): make settle the primary full-swipe action
saphid Aug 11, 2026
4ecd669
fix(swiftui): harden swipe safety state transitions
saphid Aug 11, 2026
3f90545
fix(swift-ios): close swipe safety review gaps
saphid Aug 11, 2026
f19679e
fix(swift-ios): make swipe recovery state exact
saphid Aug 11, 2026
de7e2fd
Polish swipe confirmation and undo validation
saphid Aug 11, 2026
5d5b565
Close swipe safety race conditions
saphid Aug 11, 2026
6aead64
test(swift-ios): harden settle undo races
saphid Aug 11, 2026
f966d52
fix(swift-ios): dismiss stale delete confirmation
saphid Aug 11, 2026
c767324
fix(swift-ios): dismiss stale delete confirmation
saphid Aug 11, 2026
2662960
fix(swift-ios): serialize settle undo actions
saphid Aug 11, 2026
3956fef
test(swift-ios): use environment provider catalogs
saphid Aug 11, 2026
e11dbaa
feat(swift-ios): copy thread metadata from rows
saphid Aug 10, 2026
b2e4f91
feat(swift-ios): add richer snooze presets
saphid Aug 10, 2026
2735404
feat(swift-ios): start threads on the same branch
saphid Aug 10, 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
15 changes: 9 additions & 6 deletions apps/swift-ios/Features/Root/FeatureRootModel.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -299,9 +299,10 @@ public final class FeatureRootModel {
}
}

public func setSettled(_ id: String, settled: Bool) async {
@discardableResult
public func setSettled(_ id: String, settled: Bool) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadSettled(id: id, settled: settled)
guard currentEnvironmentIdentity == environment else { return }
let settledAt = settled ? Date.now : nil
Expand All@@ -316,9 +317,10 @@ public final class FeatureRootModel {
}
}

public func setSnoozed(_ id: String, until: Date?) async {
@discardableResult
public func setSnoozed(_ id: String, until: Date?) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadSnoozed(id: id, until: until)
guard currentEnvironmentIdentity == environment else { return }
let snoozedAt = until.map { _ in Date.now }
Expand All@@ -329,9 +331,10 @@ public final class FeatureRootModel {
}
}

public func setPinned(_ id: String, pinned: Bool) async {
@discardableResult
public func setPinned(_ id: String, pinned: Bool) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadPinned(id: id, pinned: pinned)
guard currentEnvironmentIdentity == environment else { return }
mutateThread(id: id) {
Expand Down
190 changes: 139 additions & 51 deletions apps/swift-ios/Features/Workspace/HomeThreadCollectionView.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,43 @@
import SwiftUI
import UIKit

enum HomeThreadSwipeActionKind: Equatable, Sendable {
case restore
case unpin
case settle
case reopen
case archive
case delete
}

struct HomeThreadSwipeActionPlan: Equatable, Sendable {
let actions: [HomeThreadSwipeActionKind]
let performsFirstActionWithFullSwipe: Bool

static func make(
thread: FeatureThread,
isArchived: Bool,
now: Date
) -> HomeThreadSwipeActionPlan {
let primary: HomeThreadSwipeActionKind
if isArchived {
primary = .restore
} else if thread.pinnedAt != nil, thread.canTogglePin {
primary = .unpin
} else if thread.canToggleSettlement {
primary = thread.isEffectivelySettled(at: now)
? .reopen
: .settle
} else {
primary = .archive
}
return HomeThreadSwipeActionPlan(
actions: [primary, .delete],
performsFirstActionWithFullSwipe: primary == .settle || primary == .reopen
)
}
}

/// A recycled, diffable Home surface. SwiftUI still owns the surrounding shell,
/// while UIKit keeps row creation and updates proportional to visible threads.
struct HomeThreadCollectionView: UIViewRepresentable {
Expand All@@ -18,11 +55,14 @@ struct HomeThreadCollectionView: UIViewRepresentable {
let onToggleSettled: () -> Void
let onToggleArchive: () -> Void
let onShowMoreSettled: () -> Void
let newThreadAvailability: (FeatureThread) -> ThreadNewTaskAvailability
let onNewThreadOnSameBranch: (ThreadNewTaskSeedRequest) -> Void
let onRename: (FeatureThread) -> Void
let onArchive: (FeatureThread, Bool) -> Void
let onSettle: (FeatureThread, Bool) -> Void
let onSnooze: (FeatureThread, Date?) -> Void
let onPin: (FeatureThread, Bool) -> Void
let projectPath: (FeatureThread) -> String?
let onDelete: (FeatureThread) -> Void

func makeCoordinator() -> Coordinator {
Expand DownExpand Up@@ -193,55 +233,74 @@ struct HomeThreadCollectionView: UIViewRepresentable {
return nil
}

let delete = UIContextualAction(style: .destructive, title: "Delete") { [weak self] _, _, finish in
self?.parent.onDelete(thread)
finish(true)
}
delete.image = UIImage(systemName: "trash")
let plan = HomeThreadSwipeActionPlan.make(
thread: thread,
isArchived: isArchived,
now: .now
)
let actions = plan.actions.map { swipeAction($0, for: thread) }
let configuration = UISwipeActionsConfiguration(actions: actions)
configuration.performsFirstActionWithFullSwipe =
plan.performsFirstActionWithFullSwipe
return configuration
}

let primaryAction: UIContextualAction
if isArchived {
primaryAction = UIContextualAction(style: .normal, title: "Restore") {
private func swipeAction(
_ kind: HomeThreadSwipeActionKind,
for thread: FeatureThread
) -> UIContextualAction {
let action: UIContextualAction
switch kind {
case .restore:
action = UIContextualAction(style: .normal, title: "Restore") {
[weak self] _, _, finish in
self?.parent.onArchive(thread, false)
finish(true)
}
primaryAction.image = UIImage(systemName: "arrow.uturn.backward")
primaryAction.backgroundColor = .systemBlue
} else if thread.pinnedAt != nil, thread.canTogglePin {
primaryAction = UIContextualAction(style: .normal, title: "Unpin") {
action.image = UIImage(systemName: "arrow.uturn.backward")
action.backgroundColor = .systemBlue
case .unpin:
action = UIContextualAction(style: .normal, title: "Unpin") {
[weak self] _, _, finish in
self?.parent.onPin(thread, false)
finish(true)
}
primaryAction.image = UIImage(systemName: "pin.slash")
primaryAction.backgroundColor = .systemBlue
} else if thread.canToggleSettlement {
let isSettled = thread.isEffectivelySettled(at: .now)
primaryAction = UIContextualAction(
action.image = UIImage(systemName: "pin.slash")
action.backgroundColor = .systemBlue
case .settle, .reopen:
let wasSettled = kind == .reopen
action = UIContextualAction(
style: .normal,
title: isSettled ? "Reopen" : "Settle"
title: wasSettled ? "Reopen" : "Settle"
) { [weak self] _, _, finish in
self?.parent.onSettle(thread, !isSettled)
self?.parent.onSettle(thread, !wasSettled)
finish(true)
}
primaryAction.image = UIImage(
systemName: isSettled ? "arrow.counterclockwise" : "checkmark"
action.image = UIImage(
systemName: wasSettled ? "arrow.counterclockwise" : "checkmark"
)
primaryAction.backgroundColor = isSettled ? .systemBlue : .systemGreen
} else {
primaryAction = UIContextualAction(style: .normal, title: "Archive") {
action.backgroundColor = wasSettled ? .systemBlue : .systemGreen
case .archive:
action = UIContextualAction(style: .normal, title: "Archive") {
[weak self] _, _, finish in
self?.parent.onArchive(thread, true)
finish(true)
}
primaryAction.image = UIImage(systemName: "archivebox")
primaryAction.backgroundColor = .systemGray
action.image = UIImage(systemName: "archivebox")
action.backgroundColor = .systemGray
case .delete:
action = UIContextualAction(style: .normal, title: "Delete") {
[weak self] _, _, finish in
self?.parent.onDelete(thread)
// The alert owns the destructive operation. Complete this
// non-destructive contextual action so Cancel closes the
// swipe without UIKit animating a row deletion.
finish(true)
}
action.image = UIImage(systemName: "trash")
action.backgroundColor = .systemRed
}

let configuration = UISwipeActionsConfiguration(actions: [delete, primaryAction])
configuration.performsFirstActionWithFullSwipe = false
return configuration
return action
}

private func configure(
Expand DownExpand Up@@ -380,6 +439,17 @@ struct HomeThreadCollectionView: UIViewRepresentable {
}

private func menuActions(for thread: FeatureThread, isArchived: Bool) -> [UIMenuElement] {
let newThreadAvailability = parent.newThreadAvailability(thread)
let newThread = UIAction(
title: newThreadAvailability.menuTitle,
image: UIImage(systemName: "plus.bubble")
) { [weak self] _ in
guard case let .available(request) = newThreadAvailability else { return }
self?.parent.onNewThreadOnSameBranch(request)
}
if !newThreadAvailability.isEnabled {
newThread.attributes = .disabled
}
let rename = UIAction(title: "Rename", image: UIImage(systemName: "pencil")) { [weak self] _ in
self?.parent.onRename(thread)
}
Expand All@@ -390,7 +460,7 @@ struct HomeThreadCollectionView: UIViewRepresentable {
self?.parent.onArchive(thread, !isArchived)
}

var actions: [UIMenuElement] = [rename, archive]
var actions: [UIMenuElement] = [newThread, rename, archive]
if !isArchived {
if thread.canTogglePin {
let isPinned = thread.pinnedAt != nil
Expand All@@ -404,39 +474,57 @@ struct HomeThreadCollectionView: UIViewRepresentable {
)
}
if thread.canToggleSettlement {
let isSettled = thread.isEffectivelySettled(at: .now)
let wasSettled = thread.isSettled || thread.isEffectivelySettled(at: .now)
actions.append(
UIAction(
title: isSettled ? "Reopen" : "Settle",
title: wasSettled ? "Reopen" : "Settle",
image: UIImage(
systemName: isSettled ? "arrow.counterclockwise" : "checkmark"
systemName: wasSettled ? "arrow.counterclockwise" : "checkmark"
)
) { [weak self] _ in
self?.parent.onSettle(thread, !isSettled)
self?.parent.onSettle(thread, !wasSettled)
}
)
}

if thread.canToggleSnooze {
let isSnoozed = thread.isEffectivelySnoozed(at: .now)
let snooze = UIAction(
title: isSnoozed ? "Unsnooze" : "Snooze 1 hour",
image: UIImage(systemName: isSnoozed ? "bell" : "clock")
) { [weak self] _ in
self?.parent.onSnooze(
thread,
isSnoozed ? nil : Date.now.addingTimeInterval(60 * 60)
)
}
if thread.state == .queued
|| thread.state == .waitingForApproval
|| thread.state == .waitingForInput {
snooze.attributes = .disabled
switch ThreadSnoozeMenuModel.menu(for: thread, isArchived: isArchived) {
case .hidden:
break
case .unsnooze:
actions.append(
UIAction(title: "Unsnooze", image: UIImage(systemName: "bell")) {
[weak self] _ in
self?.parent.onSnooze(thread, nil)
}
)
case let .presets(presets, enabled):
let presetActions = presets.map { preset in
let action = UIAction(title: preset.menuTitle) { [weak self] _ in
self?.parent.onSnooze(thread, preset.until)
}
if !enabled { action.attributes = .disabled }
return action
}
actions.append(snooze)
actions.append(
UIMenu(
title: "Snooze",
image: UIImage(systemName: "clock"),
children: presetActions
)
)
}
}

let copyItems = ThreadMetadataCopyModel.items(
for: thread,
projectPath: parent.projectPath(thread)
)
actions.append(contentsOf: copyItems.map { item in
UIAction(title: item.title, image: UIImage(systemName: item.systemImage)) { _ in
ThreadMetadataClipboard.copy(item)
}
})

actions.append(
UIAction(title: "Delete", image: UIImage(systemName: "trash"), attributes: .destructive) {
[weak self] _ in
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

feat(swift-ios): start a new thread on the same branch#6136

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

Closed
saphid wants to merge 16 commits into from
Closed

feat(swift-ios): start a new thread on the same branch #6136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2f9f976
feat(swiftui): offer undo after settling thread
saphid Aug 11, 2026
c489281
fix(swiftui): confirm destructive thread deletion
saphid Aug 11, 2026
668a513
fix(swiftui): make settle the primary full-swipe action
saphid Aug 11, 2026
4ecd669
fix(swiftui): harden swipe safety state transitions
saphid Aug 11, 2026
3f90545
fix(swift-ios): close swipe safety review gaps
saphid Aug 11, 2026
f19679e
fix(swift-ios): make swipe recovery state exact
saphid Aug 11, 2026
de7e2fd
Polish swipe confirmation and undo validation
saphid Aug 11, 2026
5d5b565
Close swipe safety race conditions
saphid Aug 11, 2026
6aead64
test(swift-ios): harden settle undo races
saphid Aug 11, 2026
f966d52
fix(swift-ios): dismiss stale delete confirmation
saphid Aug 11, 2026
c767324
fix(swift-ios): dismiss stale delete confirmation
saphid Aug 11, 2026
2662960
fix(swift-ios): serialize settle undo actions
saphid Aug 11, 2026
3956fef
test(swift-ios): use environment provider catalogs
saphid Aug 11, 2026
e11dbaa
feat(swift-ios): copy thread metadata from rows
saphid Aug 10, 2026
b2e4f91
feat(swift-ios): add richer snooze presets
saphid Aug 10, 2026
2735404
feat(swift-ios): start threads on the same branch
saphid Aug 10, 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
15 changes: 9 additions & 6 deletions apps/swift-ios/Features/Root/FeatureRootModel.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -299,9 +299,10 @@ public final class FeatureRootModel {
}
}

public func setSettled(_ id: String, settled: Bool) async {
@discardableResult
public func setSettled(_ id: String, settled: Bool) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadSettled(id: id, settled: settled)
guard currentEnvironmentIdentity == environment else { return }
let settledAt = settled ? Date.now : nil
Expand All@@ -316,9 +317,10 @@ public final class FeatureRootModel {
}
}

public func setSnoozed(_ id: String, until: Date?) async {
@discardableResult
public func setSnoozed(_ id: String, until: Date?) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadSnoozed(id: id, until: until)
guard currentEnvironmentIdentity == environment else { return }
let snoozedAt = until.map { _ in Date.now }
Expand All@@ -329,9 +331,10 @@ public final class FeatureRootModel {
}
}

public func setPinned(_ id: String, pinned: Bool) async {
@discardableResult
public func setPinned(_ id: String, pinned: Bool) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadPinned(id: id, pinned: pinned)
guard currentEnvironmentIdentity == environment else { return }
mutateThread(id: id) {
Expand Down
190 changes: 139 additions & 51 deletions apps/swift-ios/Features/Workspace/HomeThreadCollectionView.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,43 @@
import SwiftUI
import UIKit

enum HomeThreadSwipeActionKind: Equatable, Sendable {
case restore
case unpin
case settle
case reopen
case archive
case delete
}

struct HomeThreadSwipeActionPlan: Equatable, Sendable {
let actions: [HomeThreadSwipeActionKind]
let performsFirstActionWithFullSwipe: Bool

static func make(
thread: FeatureThread,
isArchived: Bool,
now: Date
) -> HomeThreadSwipeActionPlan {
let primary: HomeThreadSwipeActionKind
if isArchived {
primary = .restore
} else if thread.pinnedAt != nil, thread.canTogglePin {
primary = .unpin
} else if thread.canToggleSettlement {
primary = thread.isEffectivelySettled(at: now)
? .reopen
: .settle
} else {
primary = .archive
}
return HomeThreadSwipeActionPlan(
actions: [primary, .delete],
performsFirstActionWithFullSwipe: primary == .settle || primary == .reopen
)
}
}

/// A recycled, diffable Home surface. SwiftUI still owns the surrounding shell,
/// while UIKit keeps row creation and updates proportional to visible threads.
struct HomeThreadCollectionView: UIViewRepresentable {
Expand All@@ -18,11 +55,14 @@ struct HomeThreadCollectionView: UIViewRepresentable {
let onToggleSettled: () -> Void
let onToggleArchive: () -> Void
let onShowMoreSettled: () -> Void
let newThreadAvailability: (FeatureThread) -> ThreadNewTaskAvailability
let onNewThreadOnSameBranch: (ThreadNewTaskSeedRequest) -> Void
let onRename: (FeatureThread) -> Void
let onArchive: (FeatureThread, Bool) -> Void
let onSettle: (FeatureThread, Bool) -> Void
let onSnooze: (FeatureThread, Date?) -> Void
let onPin: (FeatureThread, Bool) -> Void
let projectPath: (FeatureThread) -> String?
let onDelete: (FeatureThread) -> Void

func makeCoordinator() -> Coordinator {
Expand DownExpand Up@@ -193,55 +233,74 @@ struct HomeThreadCollectionView: UIViewRepresentable {
return nil
}

let delete = UIContextualAction(style: .destructive, title: "Delete") { [weak self] _, _, finish in
self?.parent.onDelete(thread)
finish(true)
}
delete.image = UIImage(systemName: "trash")
let plan = HomeThreadSwipeActionPlan.make(
thread: thread,
isArchived: isArchived,
now: .now
)
let actions = plan.actions.map { swipeAction($0, for: thread) }
let configuration = UISwipeActionsConfiguration(actions: actions)
configuration.performsFirstActionWithFullSwipe =
plan.performsFirstActionWithFullSwipe
return configuration
}

let primaryAction: UIContextualAction
if isArchived {
primaryAction = UIContextualAction(style: .normal, title: "Restore") {
private func swipeAction(
_ kind: HomeThreadSwipeActionKind,
for thread: FeatureThread
) -> UIContextualAction {
let action: UIContextualAction
switch kind {
case .restore:
action = UIContextualAction(style: .normal, title: "Restore") {
[weak self] _, _, finish in
self?.parent.onArchive(thread, false)
finish(true)
}
primaryAction.image = UIImage(systemName: "arrow.uturn.backward")
primaryAction.backgroundColor = .systemBlue
} else if thread.pinnedAt != nil, thread.canTogglePin {
primaryAction = UIContextualAction(style: .normal, title: "Unpin") {
action.image = UIImage(systemName: "arrow.uturn.backward")
action.backgroundColor = .systemBlue
case .unpin:
action = UIContextualAction(style: .normal, title: "Unpin") {
[weak self] _, _, finish in
self?.parent.onPin(thread, false)
finish(true)
}
primaryAction.image = UIImage(systemName: "pin.slash")
primaryAction.backgroundColor = .systemBlue
} else if thread.canToggleSettlement {
let isSettled = thread.isEffectivelySettled(at: .now)
primaryAction = UIContextualAction(
action.image = UIImage(systemName: "pin.slash")
action.backgroundColor = .systemBlue
case .settle, .reopen:
let wasSettled = kind == .reopen
action = UIContextualAction(
style: .normal,
title: isSettled ? "Reopen" : "Settle"
title: wasSettled ? "Reopen" : "Settle"
) { [weak self] _, _, finish in
self?.parent.onSettle(thread, !isSettled)
self?.parent.onSettle(thread, !wasSettled)
finish(true)
}
primaryAction.image = UIImage(
systemName: isSettled ? "arrow.counterclockwise" : "checkmark"
action.image = UIImage(
systemName: wasSettled ? "arrow.counterclockwise" : "checkmark"
)
primaryAction.backgroundColor = isSettled ? .systemBlue : .systemGreen
} else {
primaryAction = UIContextualAction(style: .normal, title: "Archive") {
action.backgroundColor = wasSettled ? .systemBlue : .systemGreen
case .archive:
action = UIContextualAction(style: .normal, title: "Archive") {
[weak self] _, _, finish in
self?.parent.onArchive(thread, true)
finish(true)
}
primaryAction.image = UIImage(systemName: "archivebox")
primaryAction.backgroundColor = .systemGray
action.image = UIImage(systemName: "archivebox")
action.backgroundColor = .systemGray
case .delete:
action = UIContextualAction(style: .normal, title: "Delete") {
[weak self] _, _, finish in
self?.parent.onDelete(thread)
// The alert owns the destructive operation. Complete this
// non-destructive contextual action so Cancel closes the
// swipe without UIKit animating a row deletion.
finish(true)
}
action.image = UIImage(systemName: "trash")
action.backgroundColor = .systemRed
}

let configuration = UISwipeActionsConfiguration(actions: [delete, primaryAction])
configuration.performsFirstActionWithFullSwipe = false
return configuration
return action
}

private func configure(
Expand DownExpand Up@@ -380,6 +439,17 @@ struct HomeThreadCollectionView: UIViewRepresentable {
}

private func menuActions(for thread: FeatureThread, isArchived: Bool) -> [UIMenuElement] {
let newThreadAvailability = parent.newThreadAvailability(thread)
let newThread = UIAction(
title: newThreadAvailability.menuTitle,
image: UIImage(systemName: "plus.bubble")
) { [weak self] _ in
guard case let .available(request) = newThreadAvailability else { return }
self?.parent.onNewThreadOnSameBranch(request)
}
if !newThreadAvailability.isEnabled {
newThread.attributes = .disabled
}
let rename = UIAction(title: "Rename", image: UIImage(systemName: "pencil")) { [weak self] _ in
self?.parent.onRename(thread)
}
Expand All@@ -390,7 +460,7 @@ struct HomeThreadCollectionView: UIViewRepresentable {
self?.parent.onArchive(thread, !isArchived)
}

var actions: [UIMenuElement] = [rename, archive]
var actions: [UIMenuElement] = [newThread, rename, archive]
if !isArchived {
if thread.canTogglePin {
let isPinned = thread.pinnedAt != nil
Expand All@@ -404,39 +474,57 @@ struct HomeThreadCollectionView: UIViewRepresentable {
)
}
if thread.canToggleSettlement {
let isSettled = thread.isEffectivelySettled(at: .now)
let wasSettled = thread.isSettled || thread.isEffectivelySettled(at: .now)
actions.append(
UIAction(
title: isSettled ? "Reopen" : "Settle",
title: wasSettled ? "Reopen" : "Settle",
image: UIImage(
systemName: isSettled ? "arrow.counterclockwise" : "checkmark"
systemName: wasSettled ? "arrow.counterclockwise" : "checkmark"
)
) { [weak self] _ in
self?.parent.onSettle(thread, !isSettled)
self?.parent.onSettle(thread, !wasSettled)
}
)
}

if thread.canToggleSnooze {
let isSnoozed = thread.isEffectivelySnoozed(at: .now)
let snooze = UIAction(
title: isSnoozed ? "Unsnooze" : "Snooze 1 hour",
image: UIImage(systemName: isSnoozed ? "bell" : "clock")
) { [weak self] _ in
self?.parent.onSnooze(
thread,
isSnoozed ? nil : Date.now.addingTimeInterval(60 * 60)
)
}
if thread.state == .queued
|| thread.state == .waitingForApproval
|| thread.state == .waitingForInput {
snooze.attributes = .disabled
switch ThreadSnoozeMenuModel.menu(for: thread, isArchived: isArchived) {
case .hidden:
break
case .unsnooze:
actions.append(
UIAction(title: "Unsnooze", image: UIImage(systemName: "bell")) {
[weak self] _ in
self?.parent.onSnooze(thread, nil)
}
)
case let .presets(presets, enabled):
let presetActions = presets.map { preset in
let action = UIAction(title: preset.menuTitle) { [weak self] _ in
self?.parent.onSnooze(thread, preset.until)
}
if !enabled { action.attributes = .disabled }
return action
}
actions.append(snooze)
actions.append(
UIMenu(
title: "Snooze",
image: UIImage(systemName: "clock"),
children: presetActions
)
)
}
}

let copyItems = ThreadMetadataCopyModel.items(
for: thread,
projectPath: parent.projectPath(thread)
)
actions.append(contentsOf: copyItems.map { item in
UIAction(title: item.title, image: UIImage(systemName: item.systemImage)) { _ in
ThreadMetadataClipboard.copy(item)
}
})

actions.append(
UIAction(title: "Delete", image: UIImage(systemName: "trash"), attributes: .destructive) {
[weak self] _ in
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(swift-ios): start a new thread on the same branch#6136

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

Closed
saphid wants to merge 16 commits into from
Closed

feat(swift-ios): start a new thread on the same branch #6136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2f9f976
feat(swiftui): offer undo after settling thread
saphid Aug 11, 2026
c489281
fix(swiftui): confirm destructive thread deletion
saphid Aug 11, 2026
668a513
fix(swiftui): make settle the primary full-swipe action
saphid Aug 11, 2026
4ecd669
fix(swiftui): harden swipe safety state transitions
saphid Aug 11, 2026
3f90545
fix(swift-ios): close swipe safety review gaps
saphid Aug 11, 2026
f19679e
fix(swift-ios): make swipe recovery state exact
saphid Aug 11, 2026
de7e2fd
Polish swipe confirmation and undo validation
saphid Aug 11, 2026
5d5b565
Close swipe safety race conditions
saphid Aug 11, 2026
6aead64
test(swift-ios): harden settle undo races
saphid Aug 11, 2026
f966d52
fix(swift-ios): dismiss stale delete confirmation
saphid Aug 11, 2026
c767324
fix(swift-ios): dismiss stale delete confirmation
saphid Aug 11, 2026
2662960
fix(swift-ios): serialize settle undo actions
saphid Aug 11, 2026
3956fef
test(swift-ios): use environment provider catalogs
saphid Aug 11, 2026
e11dbaa
feat(swift-ios): copy thread metadata from rows
saphid Aug 10, 2026
b2e4f91
feat(swift-ios): add richer snooze presets
saphid Aug 10, 2026
2735404
feat(swift-ios): start threads on the same branch
saphid Aug 10, 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
15 changes: 9 additions & 6 deletions apps/swift-ios/Features/Root/FeatureRootModel.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -299,9 +299,10 @@ public final class FeatureRootModel {
}
}

public func setSettled(_ id: String, settled: Bool) async {
@discardableResult
public func setSettled(_ id: String, settled: Bool) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadSettled(id: id, settled: settled)
guard currentEnvironmentIdentity == environment else { return }
let settledAt = settled ? Date.now : nil
Expand All@@ -316,9 +317,10 @@ public final class FeatureRootModel {
}
}

public func setSnoozed(_ id: String, until: Date?) async {
@discardableResult
public func setSnoozed(_ id: String, until: Date?) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadSnoozed(id: id, until: until)
guard currentEnvironmentIdentity == environment else { return }
let snoozedAt = until.map { _ in Date.now }
Expand All@@ -329,9 +331,10 @@ public final class FeatureRootModel {
}
}

public func setPinned(_ id: String, pinned: Bool) async {
@discardableResult
public func setPinned(_ id: String, pinned: Bool) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadPinned(id: id, pinned: pinned)
guard currentEnvironmentIdentity == environment else { return }
mutateThread(id: id) {
Expand Down
190 changes: 139 additions & 51 deletions apps/swift-ios/Features/Workspace/HomeThreadCollectionView.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,43 @@
import SwiftUI
import UIKit

enum HomeThreadSwipeActionKind: Equatable, Sendable {
case restore
case unpin
case settle
case reopen
case archive
case delete
}

struct HomeThreadSwipeActionPlan: Equatable, Sendable {
let actions: [HomeThreadSwipeActionKind]
let performsFirstActionWithFullSwipe: Bool

static func make(
thread: FeatureThread,
isArchived: Bool,
now: Date
) -> HomeThreadSwipeActionPlan {
let primary: HomeThreadSwipeActionKind
if isArchived {
primary = .restore
} else if thread.pinnedAt != nil, thread.canTogglePin {
primary = .unpin
} else if thread.canToggleSettlement {
primary = thread.isEffectivelySettled(at: now)
? .reopen
: .settle
} else {
primary = .archive
}
return HomeThreadSwipeActionPlan(
actions: [primary, .delete],
performsFirstActionWithFullSwipe: primary == .settle || primary == .reopen
)
}
}

/// A recycled, diffable Home surface. SwiftUI still owns the surrounding shell,
/// while UIKit keeps row creation and updates proportional to visible threads.
struct HomeThreadCollectionView: UIViewRepresentable {
Expand All@@ -18,11 +55,14 @@ struct HomeThreadCollectionView: UIViewRepresentable {
let onToggleSettled: () -> Void
let onToggleArchive: () -> Void
let onShowMoreSettled: () -> Void
let newThreadAvailability: (FeatureThread) -> ThreadNewTaskAvailability
let onNewThreadOnSameBranch: (ThreadNewTaskSeedRequest) -> Void
let onRename: (FeatureThread) -> Void
let onArchive: (FeatureThread, Bool) -> Void
let onSettle: (FeatureThread, Bool) -> Void
let onSnooze: (FeatureThread, Date?) -> Void
let onPin: (FeatureThread, Bool) -> Void
let projectPath: (FeatureThread) -> String?
let onDelete: (FeatureThread) -> Void

func makeCoordinator() -> Coordinator {
Expand DownExpand Up@@ -193,55 +233,74 @@ struct HomeThreadCollectionView: UIViewRepresentable {
return nil
}

let delete = UIContextualAction(style: .destructive, title: "Delete") { [weak self] _, _, finish in
self?.parent.onDelete(thread)
finish(true)
}
delete.image = UIImage(systemName: "trash")
let plan = HomeThreadSwipeActionPlan.make(
thread: thread,
isArchived: isArchived,
now: .now
)
let actions = plan.actions.map { swipeAction($0, for: thread) }
let configuration = UISwipeActionsConfiguration(actions: actions)
configuration.performsFirstActionWithFullSwipe =
plan.performsFirstActionWithFullSwipe
return configuration
}

let primaryAction: UIContextualAction
if isArchived {
primaryAction = UIContextualAction(style: .normal, title: "Restore") {
private func swipeAction(
_ kind: HomeThreadSwipeActionKind,
for thread: FeatureThread
) -> UIContextualAction {
let action: UIContextualAction
switch kind {
case .restore:
action = UIContextualAction(style: .normal, title: "Restore") {
[weak self] _, _, finish in
self?.parent.onArchive(thread, false)
finish(true)
}
primaryAction.image = UIImage(systemName: "arrow.uturn.backward")
primaryAction.backgroundColor = .systemBlue
} else if thread.pinnedAt != nil, thread.canTogglePin {
primaryAction = UIContextualAction(style: .normal, title: "Unpin") {
action.image = UIImage(systemName: "arrow.uturn.backward")
action.backgroundColor = .systemBlue
case .unpin:
action = UIContextualAction(style: .normal, title: "Unpin") {
[weak self] _, _, finish in
self?.parent.onPin(thread, false)
finish(true)
}
primaryAction.image = UIImage(systemName: "pin.slash")
primaryAction.backgroundColor = .systemBlue
} else if thread.canToggleSettlement {
let isSettled = thread.isEffectivelySettled(at: .now)
primaryAction = UIContextualAction(
action.image = UIImage(systemName: "pin.slash")
action.backgroundColor = .systemBlue
case .settle, .reopen:
let wasSettled = kind == .reopen
action = UIContextualAction(
style: .normal,
title: isSettled ? "Reopen" : "Settle"
title: wasSettled ? "Reopen" : "Settle"
) { [weak self] _, _, finish in
self?.parent.onSettle(thread, !isSettled)
self?.parent.onSettle(thread, !wasSettled)
finish(true)
}
primaryAction.image = UIImage(
systemName: isSettled ? "arrow.counterclockwise" : "checkmark"
action.image = UIImage(
systemName: wasSettled ? "arrow.counterclockwise" : "checkmark"
)
primaryAction.backgroundColor = isSettled ? .systemBlue : .systemGreen
} else {
primaryAction = UIContextualAction(style: .normal, title: "Archive") {
action.backgroundColor = wasSettled ? .systemBlue : .systemGreen
case .archive:
action = UIContextualAction(style: .normal, title: "Archive") {
[weak self] _, _, finish in
self?.parent.onArchive(thread, true)
finish(true)
}
primaryAction.image = UIImage(systemName: "archivebox")
primaryAction.backgroundColor = .systemGray
action.image = UIImage(systemName: "archivebox")
action.backgroundColor = .systemGray
case .delete:
action = UIContextualAction(style: .normal, title: "Delete") {
[weak self] _, _, finish in
self?.parent.onDelete(thread)
// The alert owns the destructive operation. Complete this
// non-destructive contextual action so Cancel closes the
// swipe without UIKit animating a row deletion.
finish(true)
}
action.image = UIImage(systemName: "trash")
action.backgroundColor = .systemRed
}

let configuration = UISwipeActionsConfiguration(actions: [delete, primaryAction])
configuration.performsFirstActionWithFullSwipe = false
return configuration
return action
}

private func configure(
Expand DownExpand Up@@ -380,6 +439,17 @@ struct HomeThreadCollectionView: UIViewRepresentable {
}

private func menuActions(for thread: FeatureThread, isArchived: Bool) -> [UIMenuElement] {
let newThreadAvailability = parent.newThreadAvailability(thread)
let newThread = UIAction(
title: newThreadAvailability.menuTitle,
image: UIImage(systemName: "plus.bubble")
) { [weak self] _ in
guard case let .available(request) = newThreadAvailability else { return }
self?.parent.onNewThreadOnSameBranch(request)
}
if !newThreadAvailability.isEnabled {
newThread.attributes = .disabled
}
let rename = UIAction(title: "Rename", image: UIImage(systemName: "pencil")) { [weak self] _ in
self?.parent.onRename(thread)
}
Expand All@@ -390,7 +460,7 @@ struct HomeThreadCollectionView: UIViewRepresentable {
self?.parent.onArchive(thread, !isArchived)
}

var actions: [UIMenuElement] = [rename, archive]
var actions: [UIMenuElement] = [newThread, rename, archive]
if !isArchived {
if thread.canTogglePin {
let isPinned = thread.pinnedAt != nil
Expand All@@ -404,39 +474,57 @@ struct HomeThreadCollectionView: UIViewRepresentable {
)
}
if thread.canToggleSettlement {
let isSettled = thread.isEffectivelySettled(at: .now)
let wasSettled = thread.isSettled || thread.isEffectivelySettled(at: .now)
actions.append(
UIAction(
title: isSettled ? "Reopen" : "Settle",
title: wasSettled ? "Reopen" : "Settle",
image: UIImage(
systemName: isSettled ? "arrow.counterclockwise" : "checkmark"
systemName: wasSettled ? "arrow.counterclockwise" : "checkmark"
)
) { [weak self] _ in
self?.parent.onSettle(thread, !isSettled)
self?.parent.onSettle(thread, !wasSettled)
}
)
}

if thread.canToggleSnooze {
let isSnoozed = thread.isEffectivelySnoozed(at: .now)
let snooze = UIAction(
title: isSnoozed ? "Unsnooze" : "Snooze 1 hour",
image: UIImage(systemName: isSnoozed ? "bell" : "clock")
) { [weak self] _ in
self?.parent.onSnooze(
thread,
isSnoozed ? nil : Date.now.addingTimeInterval(60 * 60)
)
}
if thread.state == .queued
|| thread.state == .waitingForApproval
|| thread.state == .waitingForInput {
snooze.attributes = .disabled
switch ThreadSnoozeMenuModel.menu(for: thread, isArchived: isArchived) {
case .hidden:
break
case .unsnooze:
actions.append(
UIAction(title: "Unsnooze", image: UIImage(systemName: "bell")) {
[weak self] _ in
self?.parent.onSnooze(thread, nil)
}
)
case let .presets(presets, enabled):
let presetActions = presets.map { preset in
let action = UIAction(title: preset.menuTitle) { [weak self] _ in
self?.parent.onSnooze(thread, preset.until)
}
if !enabled { action.attributes = .disabled }
return action
}
actions.append(snooze)
actions.append(
UIMenu(
title: "Snooze",
image: UIImage(systemName: "clock"),
children: presetActions
)
)
}
}

let copyItems = ThreadMetadataCopyModel.items(
for: thread,
projectPath: parent.projectPath(thread)
)
actions.append(contentsOf: copyItems.map { item in
UIAction(title: item.title, image: UIImage(systemName: item.systemImage)) { _ in
ThreadMetadataClipboard.copy(item)
}
})

actions.append(
UIAction(title: "Delete", image: UIImage(systemName: "trash"), attributes: .destructive) {
[weak self] _ in
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(swift-ios): start a new thread on the same branch#6136

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

Closed
saphid wants to merge 16 commits into from
Closed

feat(swift-ios): start a new thread on the same branch #6136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2f9f976
feat(swiftui): offer undo after settling thread
saphid Aug 11, 2026
c489281
fix(swiftui): confirm destructive thread deletion
saphid Aug 11, 2026
668a513
fix(swiftui): make settle the primary full-swipe action
saphid Aug 11, 2026
4ecd669
fix(swiftui): harden swipe safety state transitions
saphid Aug 11, 2026
3f90545
fix(swift-ios): close swipe safety review gaps
saphid Aug 11, 2026
f19679e
fix(swift-ios): make swipe recovery state exact
saphid Aug 11, 2026
de7e2fd
Polish swipe confirmation and undo validation
saphid Aug 11, 2026
5d5b565
Close swipe safety race conditions
saphid Aug 11, 2026
6aead64
test(swift-ios): harden settle undo races
saphid Aug 11, 2026
f966d52
fix(swift-ios): dismiss stale delete confirmation
saphid Aug 11, 2026
c767324
fix(swift-ios): dismiss stale delete confirmation
saphid Aug 11, 2026
2662960
fix(swift-ios): serialize settle undo actions
saphid Aug 11, 2026
3956fef
test(swift-ios): use environment provider catalogs
saphid Aug 11, 2026
e11dbaa
feat(swift-ios): copy thread metadata from rows
saphid Aug 10, 2026
b2e4f91
feat(swift-ios): add richer snooze presets
saphid Aug 10, 2026
2735404
feat(swift-ios): start threads on the same branch
saphid Aug 10, 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
15 changes: 9 additions & 6 deletions apps/swift-ios/Features/Root/FeatureRootModel.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -299,9 +299,10 @@ public final class FeatureRootModel {
}
}

public func setSettled(_ id: String, settled: Bool) async {
@discardableResult
public func setSettled(_ id: String, settled: Bool) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadSettled(id: id, settled: settled)
guard currentEnvironmentIdentity == environment else { return }
let settledAt = settled ? Date.now : nil
Expand All@@ -316,9 +317,10 @@ public final class FeatureRootModel {
}
}

public func setSnoozed(_ id: String, until: Date?) async {
@discardableResult
public func setSnoozed(_ id: String, until: Date?) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadSnoozed(id: id, until: until)
guard currentEnvironmentIdentity == environment else { return }
let snoozedAt = until.map { _ in Date.now }
Expand All@@ -329,9 +331,10 @@ public final class FeatureRootModel {
}
}

public func setPinned(_ id: String, pinned: Bool) async {
@discardableResult
public func setPinned(_ id: String, pinned: Bool) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadPinned(id: id, pinned: pinned)
guard currentEnvironmentIdentity == environment else { return }
mutateThread(id: id) {
Expand Down
190 changes: 139 additions & 51 deletions apps/swift-ios/Features/Workspace/HomeThreadCollectionView.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,43 @@
import SwiftUI
import UIKit

enum HomeThreadSwipeActionKind: Equatable, Sendable {
case restore
case unpin
case settle
case reopen
case archive
case delete
}

struct HomeThreadSwipeActionPlan: Equatable, Sendable {
let actions: [HomeThreadSwipeActionKind]
let performsFirstActionWithFullSwipe: Bool

static func make(
thread: FeatureThread,
isArchived: Bool,
now: Date
) -> HomeThreadSwipeActionPlan {
let primary: HomeThreadSwipeActionKind
if isArchived {
primary = .restore
} else if thread.pinnedAt != nil, thread.canTogglePin {
primary = .unpin
} else if thread.canToggleSettlement {
primary = thread.isEffectivelySettled(at: now)
? .reopen
: .settle
} else {
primary = .archive
}
return HomeThreadSwipeActionPlan(
actions: [primary, .delete],
performsFirstActionWithFullSwipe: primary == .settle || primary == .reopen
)
}
}

/// A recycled, diffable Home surface. SwiftUI still owns the surrounding shell,
/// while UIKit keeps row creation and updates proportional to visible threads.
struct HomeThreadCollectionView: UIViewRepresentable {
Expand All@@ -18,11 +55,14 @@ struct HomeThreadCollectionView: UIViewRepresentable {
let onToggleSettled: () -> Void
let onToggleArchive: () -> Void
let onShowMoreSettled: () -> Void
let newThreadAvailability: (FeatureThread) -> ThreadNewTaskAvailability
let onNewThreadOnSameBranch: (ThreadNewTaskSeedRequest) -> Void
let onRename: (FeatureThread) -> Void
let onArchive: (FeatureThread, Bool) -> Void
let onSettle: (FeatureThread, Bool) -> Void
let onSnooze: (FeatureThread, Date?) -> Void
let onPin: (FeatureThread, Bool) -> Void
let projectPath: (FeatureThread) -> String?
let onDelete: (FeatureThread) -> Void

func makeCoordinator() -> Coordinator {
Expand DownExpand Up@@ -193,55 +233,74 @@ struct HomeThreadCollectionView: UIViewRepresentable {
return nil
}

let delete = UIContextualAction(style: .destructive, title: "Delete") { [weak self] _, _, finish in
self?.parent.onDelete(thread)
finish(true)
}
delete.image = UIImage(systemName: "trash")
let plan = HomeThreadSwipeActionPlan.make(
thread: thread,
isArchived: isArchived,
now: .now
)
let actions = plan.actions.map { swipeAction($0, for: thread) }
let configuration = UISwipeActionsConfiguration(actions: actions)
configuration.performsFirstActionWithFullSwipe =
plan.performsFirstActionWithFullSwipe
return configuration
}

let primaryAction: UIContextualAction
if isArchived {
primaryAction = UIContextualAction(style: .normal, title: "Restore") {
private func swipeAction(
_ kind: HomeThreadSwipeActionKind,
for thread: FeatureThread
) -> UIContextualAction {
let action: UIContextualAction
switch kind {
case .restore:
action = UIContextualAction(style: .normal, title: "Restore") {
[weak self] _, _, finish in
self?.parent.onArchive(thread, false)
finish(true)
}
primaryAction.image = UIImage(systemName: "arrow.uturn.backward")
primaryAction.backgroundColor = .systemBlue
} else if thread.pinnedAt != nil, thread.canTogglePin {
primaryAction = UIContextualAction(style: .normal, title: "Unpin") {
action.image = UIImage(systemName: "arrow.uturn.backward")
action.backgroundColor = .systemBlue
case .unpin:
action = UIContextualAction(style: .normal, title: "Unpin") {
[weak self] _, _, finish in
self?.parent.onPin(thread, false)
finish(true)
}
primaryAction.image = UIImage(systemName: "pin.slash")
primaryAction.backgroundColor = .systemBlue
} else if thread.canToggleSettlement {
let isSettled = thread.isEffectivelySettled(at: .now)
primaryAction = UIContextualAction(
action.image = UIImage(systemName: "pin.slash")
action.backgroundColor = .systemBlue
case .settle, .reopen:
let wasSettled = kind == .reopen
action = UIContextualAction(
style: .normal,
title: isSettled ? "Reopen" : "Settle"
title: wasSettled ? "Reopen" : "Settle"
) { [weak self] _, _, finish in
self?.parent.onSettle(thread, !isSettled)
self?.parent.onSettle(thread, !wasSettled)
finish(true)
}
primaryAction.image = UIImage(
systemName: isSettled ? "arrow.counterclockwise" : "checkmark"
action.image = UIImage(
systemName: wasSettled ? "arrow.counterclockwise" : "checkmark"
)
primaryAction.backgroundColor = isSettled ? .systemBlue : .systemGreen
} else {
primaryAction = UIContextualAction(style: .normal, title: "Archive") {
action.backgroundColor = wasSettled ? .systemBlue : .systemGreen
case .archive:
action = UIContextualAction(style: .normal, title: "Archive") {
[weak self] _, _, finish in
self?.parent.onArchive(thread, true)
finish(true)
}
primaryAction.image = UIImage(systemName: "archivebox")
primaryAction.backgroundColor = .systemGray
action.image = UIImage(systemName: "archivebox")
action.backgroundColor = .systemGray
case .delete:
action = UIContextualAction(style: .normal, title: "Delete") {
[weak self] _, _, finish in
self?.parent.onDelete(thread)
// The alert owns the destructive operation. Complete this
// non-destructive contextual action so Cancel closes the
// swipe without UIKit animating a row deletion.
finish(true)
}
action.image = UIImage(systemName: "trash")
action.backgroundColor = .systemRed
}

let configuration = UISwipeActionsConfiguration(actions: [delete, primaryAction])
configuration.performsFirstActionWithFullSwipe = false
return configuration
return action
}

private func configure(
Expand DownExpand Up@@ -380,6 +439,17 @@ struct HomeThreadCollectionView: UIViewRepresentable {
}

private func menuActions(for thread: FeatureThread, isArchived: Bool) -> [UIMenuElement] {
let newThreadAvailability = parent.newThreadAvailability(thread)
let newThread = UIAction(
title: newThreadAvailability.menuTitle,
image: UIImage(systemName: "plus.bubble")
) { [weak self] _ in
guard case let .available(request) = newThreadAvailability else { return }
self?.parent.onNewThreadOnSameBranch(request)
}
if !newThreadAvailability.isEnabled {
newThread.attributes = .disabled
}
let rename = UIAction(title: "Rename", image: UIImage(systemName: "pencil")) { [weak self] _ in
self?.parent.onRename(thread)
}
Expand All@@ -390,7 +460,7 @@ struct HomeThreadCollectionView: UIViewRepresentable {
self?.parent.onArchive(thread, !isArchived)
}

var actions: [UIMenuElement] = [rename, archive]
var actions: [UIMenuElement] = [newThread, rename, archive]
if !isArchived {
if thread.canTogglePin {
let isPinned = thread.pinnedAt != nil
Expand All@@ -404,39 +474,57 @@ struct HomeThreadCollectionView: UIViewRepresentable {
)
}
if thread.canToggleSettlement {
let isSettled = thread.isEffectivelySettled(at: .now)
let wasSettled = thread.isSettled || thread.isEffectivelySettled(at: .now)
actions.append(
UIAction(
title: isSettled ? "Reopen" : "Settle",
title: wasSettled ? "Reopen" : "Settle",
image: UIImage(
systemName: isSettled ? "arrow.counterclockwise" : "checkmark"
systemName: wasSettled ? "arrow.counterclockwise" : "checkmark"
)
) { [weak self] _ in
self?.parent.onSettle(thread, !isSettled)
self?.parent.onSettle(thread, !wasSettled)
}
)
}

if thread.canToggleSnooze {
let isSnoozed = thread.isEffectivelySnoozed(at: .now)
let snooze = UIAction(
title: isSnoozed ? "Unsnooze" : "Snooze 1 hour",
image: UIImage(systemName: isSnoozed ? "bell" : "clock")
) { [weak self] _ in
self?.parent.onSnooze(
thread,
isSnoozed ? nil : Date.now.addingTimeInterval(60 * 60)
)
}
if thread.state == .queued
|| thread.state == .waitingForApproval
|| thread.state == .waitingForInput {
snooze.attributes = .disabled
switch ThreadSnoozeMenuModel.menu(for: thread, isArchived: isArchived) {
case .hidden:
break
case .unsnooze:
actions.append(
UIAction(title: "Unsnooze", image: UIImage(systemName: "bell")) {
[weak self] _ in
self?.parent.onSnooze(thread, nil)
}
)
case let .presets(presets, enabled):
let presetActions = presets.map { preset in
let action = UIAction(title: preset.menuTitle) { [weak self] _ in
self?.parent.onSnooze(thread, preset.until)
}
if !enabled { action.attributes = .disabled }
return action
}
actions.append(snooze)
actions.append(
UIMenu(
title: "Snooze",
image: UIImage(systemName: "clock"),
children: presetActions
)
)
}
}

let copyItems = ThreadMetadataCopyModel.items(
for: thread,
projectPath: parent.projectPath(thread)
)
actions.append(contentsOf: copyItems.map { item in
UIAction(title: item.title, image: UIImage(systemName: item.systemImage)) { _ in
ThreadMetadataClipboard.copy(item)
}
})

actions.append(
UIAction(title: "Delete", image: UIImage(systemName: "trash"), attributes: .destructive) {
[weak self] _ in
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

feat(swift-ios): start a new thread on the same branch#6136

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

Closed
saphid wants to merge 16 commits into from
Closed

feat(swift-ios): start a new thread on the same branch #6136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2f9f976
feat(swiftui): offer undo after settling thread
saphid Aug 11, 2026
c489281
fix(swiftui): confirm destructive thread deletion
saphid Aug 11, 2026
668a513
fix(swiftui): make settle the primary full-swipe action
saphid Aug 11, 2026
4ecd669
fix(swiftui): harden swipe safety state transitions
saphid Aug 11, 2026
3f90545
fix(swift-ios): close swipe safety review gaps
saphid Aug 11, 2026
f19679e
fix(swift-ios): make swipe recovery state exact
saphid Aug 11, 2026
de7e2fd
Polish swipe confirmation and undo validation
saphid Aug 11, 2026
5d5b565
Close swipe safety race conditions
saphid Aug 11, 2026
6aead64
test(swift-ios): harden settle undo races
saphid Aug 11, 2026
f966d52
fix(swift-ios): dismiss stale delete confirmation
saphid Aug 11, 2026
c767324
fix(swift-ios): dismiss stale delete confirmation
saphid Aug 11, 2026
2662960
fix(swift-ios): serialize settle undo actions
saphid Aug 11, 2026
3956fef
test(swift-ios): use environment provider catalogs
saphid Aug 11, 2026
e11dbaa
feat(swift-ios): copy thread metadata from rows
saphid Aug 10, 2026
b2e4f91
feat(swift-ios): add richer snooze presets
saphid Aug 10, 2026
2735404
feat(swift-ios): start threads on the same branch
saphid Aug 10, 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
15 changes: 9 additions & 6 deletions apps/swift-ios/Features/Root/FeatureRootModel.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -299,9 +299,10 @@ public final class FeatureRootModel {
}
}

public func setSettled(_ id: String, settled: Bool) async {
@discardableResult
public func setSettled(_ id: String, settled: Bool) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadSettled(id: id, settled: settled)
guard currentEnvironmentIdentity == environment else { return }
let settledAt = settled ? Date.now : nil
Expand All@@ -316,9 +317,10 @@ public final class FeatureRootModel {
}
}

public func setSnoozed(_ id: String, until: Date?) async {
@discardableResult
public func setSnoozed(_ id: String, until: Date?) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadSnoozed(id: id, until: until)
guard currentEnvironmentIdentity == environment else { return }
let snoozedAt = until.map { _ in Date.now }
Expand All@@ -329,9 +331,10 @@ public final class FeatureRootModel {
}
}

public func setPinned(_ id: String, pinned: Bool) async {
@discardableResult
public func setPinned(_ id: String, pinned: Bool) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadPinned(id: id, pinned: pinned)
guard currentEnvironmentIdentity == environment else { return }
mutateThread(id: id) {
Expand Down
190 changes: 139 additions & 51 deletions apps/swift-ios/Features/Workspace/HomeThreadCollectionView.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,43 @@
import SwiftUI
import UIKit

enum HomeThreadSwipeActionKind: Equatable, Sendable {
case restore
case unpin
case settle
case reopen
case archive
case delete
}

struct HomeThreadSwipeActionPlan: Equatable, Sendable {
let actions: [HomeThreadSwipeActionKind]
let performsFirstActionWithFullSwipe: Bool

static func make(
thread: FeatureThread,
isArchived: Bool,
now: Date
) -> HomeThreadSwipeActionPlan {
let primary: HomeThreadSwipeActionKind
if isArchived {
primary = .restore
} else if thread.pinnedAt != nil, thread.canTogglePin {
primary = .unpin
} else if thread.canToggleSettlement {
primary = thread.isEffectivelySettled(at: now)
? .reopen
: .settle
} else {
primary = .archive
}
return HomeThreadSwipeActionPlan(
actions: [primary, .delete],
performsFirstActionWithFullSwipe: primary == .settle || primary == .reopen
)
}
}

/// A recycled, diffable Home surface. SwiftUI still owns the surrounding shell,
/// while UIKit keeps row creation and updates proportional to visible threads.
struct HomeThreadCollectionView: UIViewRepresentable {
Expand All@@ -18,11 +55,14 @@ struct HomeThreadCollectionView: UIViewRepresentable {
let onToggleSettled: () -> Void
let onToggleArchive: () -> Void
let onShowMoreSettled: () -> Void
let newThreadAvailability: (FeatureThread) -> ThreadNewTaskAvailability
let onNewThreadOnSameBranch: (ThreadNewTaskSeedRequest) -> Void
let onRename: (FeatureThread) -> Void
let onArchive: (FeatureThread, Bool) -> Void
let onSettle: (FeatureThread, Bool) -> Void
let onSnooze: (FeatureThread, Date?) -> Void
let onPin: (FeatureThread, Bool) -> Void
let projectPath: (FeatureThread) -> String?
let onDelete: (FeatureThread) -> Void

func makeCoordinator() -> Coordinator {
Expand DownExpand Up@@ -193,55 +233,74 @@ struct HomeThreadCollectionView: UIViewRepresentable {
return nil
}

let delete = UIContextualAction(style: .destructive, title: "Delete") { [weak self] _, _, finish in
self?.parent.onDelete(thread)
finish(true)
}
delete.image = UIImage(systemName: "trash")
let plan = HomeThreadSwipeActionPlan.make(
thread: thread,
isArchived: isArchived,
now: .now
)
let actions = plan.actions.map { swipeAction($0, for: thread) }
let configuration = UISwipeActionsConfiguration(actions: actions)
configuration.performsFirstActionWithFullSwipe =
plan.performsFirstActionWithFullSwipe
return configuration
}

let primaryAction: UIContextualAction
if isArchived {
primaryAction = UIContextualAction(style: .normal, title: "Restore") {
private func swipeAction(
_ kind: HomeThreadSwipeActionKind,
for thread: FeatureThread
) -> UIContextualAction {
let action: UIContextualAction
switch kind {
case .restore:
action = UIContextualAction(style: .normal, title: "Restore") {
[weak self] _, _, finish in
self?.parent.onArchive(thread, false)
finish(true)
}
primaryAction.image = UIImage(systemName: "arrow.uturn.backward")
primaryAction.backgroundColor = .systemBlue
} else if thread.pinnedAt != nil, thread.canTogglePin {
primaryAction = UIContextualAction(style: .normal, title: "Unpin") {
action.image = UIImage(systemName: "arrow.uturn.backward")
action.backgroundColor = .systemBlue
case .unpin:
action = UIContextualAction(style: .normal, title: "Unpin") {
[weak self] _, _, finish in
self?.parent.onPin(thread, false)
finish(true)
}
primaryAction.image = UIImage(systemName: "pin.slash")
primaryAction.backgroundColor = .systemBlue
} else if thread.canToggleSettlement {
let isSettled = thread.isEffectivelySettled(at: .now)
primaryAction = UIContextualAction(
action.image = UIImage(systemName: "pin.slash")
action.backgroundColor = .systemBlue
case .settle, .reopen:
let wasSettled = kind == .reopen
action = UIContextualAction(
style: .normal,
title: isSettled ? "Reopen" : "Settle"
title: wasSettled ? "Reopen" : "Settle"
) { [weak self] _, _, finish in
self?.parent.onSettle(thread, !isSettled)
self?.parent.onSettle(thread, !wasSettled)
finish(true)
}
primaryAction.image = UIImage(
systemName: isSettled ? "arrow.counterclockwise" : "checkmark"
action.image = UIImage(
systemName: wasSettled ? "arrow.counterclockwise" : "checkmark"
)
primaryAction.backgroundColor = isSettled ? .systemBlue : .systemGreen
} else {
primaryAction = UIContextualAction(style: .normal, title: "Archive") {
action.backgroundColor = wasSettled ? .systemBlue : .systemGreen
case .archive:
action = UIContextualAction(style: .normal, title: "Archive") {
[weak self] _, _, finish in
self?.parent.onArchive(thread, true)
finish(true)
}
primaryAction.image = UIImage(systemName: "archivebox")
primaryAction.backgroundColor = .systemGray
action.image = UIImage(systemName: "archivebox")
action.backgroundColor = .systemGray
case .delete:
action = UIContextualAction(style: .normal, title: "Delete") {
[weak self] _, _, finish in
self?.parent.onDelete(thread)
// The alert owns the destructive operation. Complete this
// non-destructive contextual action so Cancel closes the
// swipe without UIKit animating a row deletion.
finish(true)
}
action.image = UIImage(systemName: "trash")
action.backgroundColor = .systemRed
}

let configuration = UISwipeActionsConfiguration(actions: [delete, primaryAction])
configuration.performsFirstActionWithFullSwipe = false
return configuration
return action
}

private func configure(
Expand DownExpand Up@@ -380,6 +439,17 @@ struct HomeThreadCollectionView: UIViewRepresentable {
}

private func menuActions(for thread: FeatureThread, isArchived: Bool) -> [UIMenuElement] {
let newThreadAvailability = parent.newThreadAvailability(thread)
let newThread = UIAction(
title: newThreadAvailability.menuTitle,
image: UIImage(systemName: "plus.bubble")
) { [weak self] _ in
guard case let .available(request) = newThreadAvailability else { return }
self?.parent.onNewThreadOnSameBranch(request)
}
if !newThreadAvailability.isEnabled {
newThread.attributes = .disabled
}
let rename = UIAction(title: "Rename", image: UIImage(systemName: "pencil")) { [weak self] _ in
self?.parent.onRename(thread)
}
Expand All@@ -390,7 +460,7 @@ struct HomeThreadCollectionView: UIViewRepresentable {
self?.parent.onArchive(thread, !isArchived)
}

var actions: [UIMenuElement] = [rename, archive]
var actions: [UIMenuElement] = [newThread, rename, archive]
if !isArchived {
if thread.canTogglePin {
let isPinned = thread.pinnedAt != nil
Expand All@@ -404,39 +474,57 @@ struct HomeThreadCollectionView: UIViewRepresentable {
)
}
if thread.canToggleSettlement {
let isSettled = thread.isEffectivelySettled(at: .now)
let wasSettled = thread.isSettled || thread.isEffectivelySettled(at: .now)
actions.append(
UIAction(
title: isSettled ? "Reopen" : "Settle",
title: wasSettled ? "Reopen" : "Settle",
image: UIImage(
systemName: isSettled ? "arrow.counterclockwise" : "checkmark"
systemName: wasSettled ? "arrow.counterclockwise" : "checkmark"
)
) { [weak self] _ in
self?.parent.onSettle(thread, !isSettled)
self?.parent.onSettle(thread, !wasSettled)
}
)
}

if thread.canToggleSnooze {
let isSnoozed = thread.isEffectivelySnoozed(at: .now)
let snooze = UIAction(
title: isSnoozed ? "Unsnooze" : "Snooze 1 hour",
image: UIImage(systemName: isSnoozed ? "bell" : "clock")
) { [weak self] _ in
self?.parent.onSnooze(
thread,
isSnoozed ? nil : Date.now.addingTimeInterval(60 * 60)
)
}
if thread.state == .queued
|| thread.state == .waitingForApproval
|| thread.state == .waitingForInput {
snooze.attributes = .disabled
switch ThreadSnoozeMenuModel.menu(for: thread, isArchived: isArchived) {
case .hidden:
break
case .unsnooze:
actions.append(
UIAction(title: "Unsnooze", image: UIImage(systemName: "bell")) {
[weak self] _ in
self?.parent.onSnooze(thread, nil)
}
)
case let .presets(presets, enabled):
let presetActions = presets.map { preset in
let action = UIAction(title: preset.menuTitle) { [weak self] _ in
self?.parent.onSnooze(thread, preset.until)
}
if !enabled { action.attributes = .disabled }
return action
}
actions.append(snooze)
actions.append(
UIMenu(
title: "Snooze",
image: UIImage(systemName: "clock"),
children: presetActions
)
)
}
}

let copyItems = ThreadMetadataCopyModel.items(
for: thread,
projectPath: parent.projectPath(thread)
)
actions.append(contentsOf: copyItems.map { item in
UIAction(title: item.title, image: UIImage(systemName: item.systemImage)) { _ in
ThreadMetadataClipboard.copy(item)
}
})

actions.append(
UIAction(title: "Delete", image: UIImage(systemName: "trash"), attributes: .destructive) {
[weak self] _ in
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(swift-ios): start a new thread on the same branch#6136

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

Closed
saphid wants to merge 16 commits into from
Closed

feat(swift-ios): start a new thread on the same branch #6136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2f9f976
feat(swiftui): offer undo after settling thread
saphid Aug 11, 2026
c489281
fix(swiftui): confirm destructive thread deletion
saphid Aug 11, 2026
668a513
fix(swiftui): make settle the primary full-swipe action
saphid Aug 11, 2026
4ecd669
fix(swiftui): harden swipe safety state transitions
saphid Aug 11, 2026
3f90545
fix(swift-ios): close swipe safety review gaps
saphid Aug 11, 2026
f19679e
fix(swift-ios): make swipe recovery state exact
saphid Aug 11, 2026
de7e2fd
Polish swipe confirmation and undo validation
saphid Aug 11, 2026
5d5b565
Close swipe safety race conditions
saphid Aug 11, 2026
6aead64
test(swift-ios): harden settle undo races
saphid Aug 11, 2026
f966d52
fix(swift-ios): dismiss stale delete confirmation
saphid Aug 11, 2026
c767324
fix(swift-ios): dismiss stale delete confirmation
saphid Aug 11, 2026
2662960
fix(swift-ios): serialize settle undo actions
saphid Aug 11, 2026
3956fef
test(swift-ios): use environment provider catalogs
saphid Aug 11, 2026
e11dbaa
feat(swift-ios): copy thread metadata from rows
saphid Aug 10, 2026
b2e4f91
feat(swift-ios): add richer snooze presets
saphid Aug 10, 2026
2735404
feat(swift-ios): start threads on the same branch
saphid Aug 10, 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
15 changes: 9 additions & 6 deletions apps/swift-ios/Features/Root/FeatureRootModel.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -299,9 +299,10 @@ public final class FeatureRootModel {
}
}

public func setSettled(_ id: String, settled: Bool) async {
@discardableResult
public func setSettled(_ id: String, settled: Bool) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadSettled(id: id, settled: settled)
guard currentEnvironmentIdentity == environment else { return }
let settledAt = settled ? Date.now : nil
Expand All@@ -316,9 +317,10 @@ public final class FeatureRootModel {
}
}

public func setSnoozed(_ id: String, until: Date?) async {
@discardableResult
public func setSnoozed(_ id: String, until: Date?) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadSnoozed(id: id, until: until)
guard currentEnvironmentIdentity == environment else { return }
let snoozedAt = until.map { _ in Date.now }
Expand All@@ -329,9 +331,10 @@ public final class FeatureRootModel {
}
}

public func setPinned(_ id: String, pinned: Bool) async {
@discardableResult
public func setPinned(_ id: String, pinned: Bool) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadPinned(id: id, pinned: pinned)
guard currentEnvironmentIdentity == environment else { return }
mutateThread(id: id) {
Expand Down
190 changes: 139 additions & 51 deletions apps/swift-ios/Features/Workspace/HomeThreadCollectionView.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,43 @@
import SwiftUI
import UIKit

enum HomeThreadSwipeActionKind: Equatable, Sendable {
case restore
case unpin
case settle
case reopen
case archive
case delete
}

struct HomeThreadSwipeActionPlan: Equatable, Sendable {
let actions: [HomeThreadSwipeActionKind]
let performsFirstActionWithFullSwipe: Bool

static func make(
thread: FeatureThread,
isArchived: Bool,
now: Date
) -> HomeThreadSwipeActionPlan {
let primary: HomeThreadSwipeActionKind
if isArchived {
primary = .restore
} else if thread.pinnedAt != nil, thread.canTogglePin {
primary = .unpin
} else if thread.canToggleSettlement {
primary = thread.isEffectivelySettled(at: now)
? .reopen
: .settle
} else {
primary = .archive
}
return HomeThreadSwipeActionPlan(
actions: [primary, .delete],
performsFirstActionWithFullSwipe: primary == .settle || primary == .reopen
)
}
}

/// A recycled, diffable Home surface. SwiftUI still owns the surrounding shell,
/// while UIKit keeps row creation and updates proportional to visible threads.
struct HomeThreadCollectionView: UIViewRepresentable {
Expand All@@ -18,11 +55,14 @@ struct HomeThreadCollectionView: UIViewRepresentable {
let onToggleSettled: () -> Void
let onToggleArchive: () -> Void
let onShowMoreSettled: () -> Void
let newThreadAvailability: (FeatureThread) -> ThreadNewTaskAvailability
let onNewThreadOnSameBranch: (ThreadNewTaskSeedRequest) -> Void
let onRename: (FeatureThread) -> Void
let onArchive: (FeatureThread, Bool) -> Void
let onSettle: (FeatureThread, Bool) -> Void
let onSnooze: (FeatureThread, Date?) -> Void
let onPin: (FeatureThread, Bool) -> Void
let projectPath: (FeatureThread) -> String?
let onDelete: (FeatureThread) -> Void

func makeCoordinator() -> Coordinator {
Expand DownExpand Up@@ -193,55 +233,74 @@ struct HomeThreadCollectionView: UIViewRepresentable {
return nil
}

let delete = UIContextualAction(style: .destructive, title: "Delete") { [weak self] _, _, finish in
self?.parent.onDelete(thread)
finish(true)
}
delete.image = UIImage(systemName: "trash")
let plan = HomeThreadSwipeActionPlan.make(
thread: thread,
isArchived: isArchived,
now: .now
)
let actions = plan.actions.map { swipeAction($0, for: thread) }
let configuration = UISwipeActionsConfiguration(actions: actions)
configuration.performsFirstActionWithFullSwipe =
plan.performsFirstActionWithFullSwipe
return configuration
}

let primaryAction: UIContextualAction
if isArchived {
primaryAction = UIContextualAction(style: .normal, title: "Restore") {
private func swipeAction(
_ kind: HomeThreadSwipeActionKind,
for thread: FeatureThread
) -> UIContextualAction {
let action: UIContextualAction
switch kind {
case .restore:
action = UIContextualAction(style: .normal, title: "Restore") {
[weak self] _, _, finish in
self?.parent.onArchive(thread, false)
finish(true)
}
primaryAction.image = UIImage(systemName: "arrow.uturn.backward")
primaryAction.backgroundColor = .systemBlue
} else if thread.pinnedAt != nil, thread.canTogglePin {
primaryAction = UIContextualAction(style: .normal, title: "Unpin") {
action.image = UIImage(systemName: "arrow.uturn.backward")
action.backgroundColor = .systemBlue
case .unpin:
action = UIContextualAction(style: .normal, title: "Unpin") {
[weak self] _, _, finish in
self?.parent.onPin(thread, false)
finish(true)
}
primaryAction.image = UIImage(systemName: "pin.slash")
primaryAction.backgroundColor = .systemBlue
} else if thread.canToggleSettlement {
let isSettled = thread.isEffectivelySettled(at: .now)
primaryAction = UIContextualAction(
action.image = UIImage(systemName: "pin.slash")
action.backgroundColor = .systemBlue
case .settle, .reopen:
let wasSettled = kind == .reopen
action = UIContextualAction(
style: .normal,
title: isSettled ? "Reopen" : "Settle"
title: wasSettled ? "Reopen" : "Settle"
) { [weak self] _, _, finish in
self?.parent.onSettle(thread, !isSettled)
self?.parent.onSettle(thread, !wasSettled)
finish(true)
}
primaryAction.image = UIImage(
systemName: isSettled ? "arrow.counterclockwise" : "checkmark"
action.image = UIImage(
systemName: wasSettled ? "arrow.counterclockwise" : "checkmark"
)
primaryAction.backgroundColor = isSettled ? .systemBlue : .systemGreen
} else {
primaryAction = UIContextualAction(style: .normal, title: "Archive") {
action.backgroundColor = wasSettled ? .systemBlue : .systemGreen
case .archive:
action = UIContextualAction(style: .normal, title: "Archive") {
[weak self] _, _, finish in
self?.parent.onArchive(thread, true)
finish(true)
}
primaryAction.image = UIImage(systemName: "archivebox")
primaryAction.backgroundColor = .systemGray
action.image = UIImage(systemName: "archivebox")
action.backgroundColor = .systemGray
case .delete:
action = UIContextualAction(style: .normal, title: "Delete") {
[weak self] _, _, finish in
self?.parent.onDelete(thread)
// The alert owns the destructive operation. Complete this
// non-destructive contextual action so Cancel closes the
// swipe without UIKit animating a row deletion.
finish(true)
}
action.image = UIImage(systemName: "trash")
action.backgroundColor = .systemRed
}

let configuration = UISwipeActionsConfiguration(actions: [delete, primaryAction])
configuration.performsFirstActionWithFullSwipe = false
return configuration
return action
}

private func configure(
Expand DownExpand Up@@ -380,6 +439,17 @@ struct HomeThreadCollectionView: UIViewRepresentable {
}

private func menuActions(for thread: FeatureThread, isArchived: Bool) -> [UIMenuElement] {
let newThreadAvailability = parent.newThreadAvailability(thread)
let newThread = UIAction(
title: newThreadAvailability.menuTitle,
image: UIImage(systemName: "plus.bubble")
) { [weak self] _ in
guard case let .available(request) = newThreadAvailability else { return }
self?.parent.onNewThreadOnSameBranch(request)
}
if !newThreadAvailability.isEnabled {
newThread.attributes = .disabled
}
let rename = UIAction(title: "Rename", image: UIImage(systemName: "pencil")) { [weak self] _ in
self?.parent.onRename(thread)
}
Expand All@@ -390,7 +460,7 @@ struct HomeThreadCollectionView: UIViewRepresentable {
self?.parent.onArchive(thread, !isArchived)
}

var actions: [UIMenuElement] = [rename, archive]
var actions: [UIMenuElement] = [newThread, rename, archive]
if !isArchived {
if thread.canTogglePin {
let isPinned = thread.pinnedAt != nil
Expand All@@ -404,39 +474,57 @@ struct HomeThreadCollectionView: UIViewRepresentable {
)
}
if thread.canToggleSettlement {
let isSettled = thread.isEffectivelySettled(at: .now)
let wasSettled = thread.isSettled || thread.isEffectivelySettled(at: .now)
actions.append(
UIAction(
title: isSettled ? "Reopen" : "Settle",
title: wasSettled ? "Reopen" : "Settle",
image: UIImage(
systemName: isSettled ? "arrow.counterclockwise" : "checkmark"
systemName: wasSettled ? "arrow.counterclockwise" : "checkmark"
)
) { [weak self] _ in
self?.parent.onSettle(thread, !isSettled)
self?.parent.onSettle(thread, !wasSettled)
}
)
}

if thread.canToggleSnooze {
let isSnoozed = thread.isEffectivelySnoozed(at: .now)
let snooze = UIAction(
title: isSnoozed ? "Unsnooze" : "Snooze 1 hour",
image: UIImage(systemName: isSnoozed ? "bell" : "clock")
) { [weak self] _ in
self?.parent.onSnooze(
thread,
isSnoozed ? nil : Date.now.addingTimeInterval(60 * 60)
)
}
if thread.state == .queued
|| thread.state == .waitingForApproval
|| thread.state == .waitingForInput {
snooze.attributes = .disabled
switch ThreadSnoozeMenuModel.menu(for: thread, isArchived: isArchived) {
case .hidden:
break
case .unsnooze:
actions.append(
UIAction(title: "Unsnooze", image: UIImage(systemName: "bell")) {
[weak self] _ in
self?.parent.onSnooze(thread, nil)
}
)
case let .presets(presets, enabled):
let presetActions = presets.map { preset in
let action = UIAction(title: preset.menuTitle) { [weak self] _ in
self?.parent.onSnooze(thread, preset.until)
}
if !enabled { action.attributes = .disabled }
return action
}
actions.append(snooze)
actions.append(
UIMenu(
title: "Snooze",
image: UIImage(systemName: "clock"),
children: presetActions
)
)
}
}

let copyItems = ThreadMetadataCopyModel.items(
for: thread,
projectPath: parent.projectPath(thread)
)
actions.append(contentsOf: copyItems.map { item in
UIAction(title: item.title, image: UIImage(systemName: item.systemImage)) { _ in
ThreadMetadataClipboard.copy(item)
}
})

actions.append(
UIAction(title: "Delete", image: UIImage(systemName: "trash"), attributes: .destructive) {
[weak self] _ in
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(swift-ios): start a new thread on the same branch#6136

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

Closed
saphid wants to merge 16 commits into from
Closed

feat(swift-ios): start a new thread on the same branch #6136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2f9f976
feat(swiftui): offer undo after settling thread
saphid Aug 11, 2026
c489281
fix(swiftui): confirm destructive thread deletion
saphid Aug 11, 2026
668a513
fix(swiftui): make settle the primary full-swipe action
saphid Aug 11, 2026
4ecd669
fix(swiftui): harden swipe safety state transitions
saphid Aug 11, 2026
3f90545
fix(swift-ios): close swipe safety review gaps
saphid Aug 11, 2026
f19679e
fix(swift-ios): make swipe recovery state exact
saphid Aug 11, 2026
de7e2fd
Polish swipe confirmation and undo validation
saphid Aug 11, 2026
5d5b565
Close swipe safety race conditions
saphid Aug 11, 2026
6aead64
test(swift-ios): harden settle undo races
saphid Aug 11, 2026
f966d52
fix(swift-ios): dismiss stale delete confirmation
saphid Aug 11, 2026
c767324
fix(swift-ios): dismiss stale delete confirmation
saphid Aug 11, 2026
2662960
fix(swift-ios): serialize settle undo actions
saphid Aug 11, 2026
3956fef
test(swift-ios): use environment provider catalogs
saphid Aug 11, 2026
e11dbaa
feat(swift-ios): copy thread metadata from rows
saphid Aug 10, 2026
b2e4f91
feat(swift-ios): add richer snooze presets
saphid Aug 10, 2026
2735404
feat(swift-ios): start threads on the same branch
saphid Aug 10, 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
15 changes: 9 additions & 6 deletions apps/swift-ios/Features/Root/FeatureRootModel.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -299,9 +299,10 @@ public final class FeatureRootModel {
}
}

public func setSettled(_ id: String, settled: Bool) async {
@discardableResult
public func setSettled(_ id: String, settled: Bool) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadSettled(id: id, settled: settled)
guard currentEnvironmentIdentity == environment else { return }
let settledAt = settled ? Date.now : nil
Expand All@@ -316,9 +317,10 @@ public final class FeatureRootModel {
}
}

public func setSnoozed(_ id: String, until: Date?) async {
@discardableResult
public func setSnoozed(_ id: String, until: Date?) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadSnoozed(id: id, until: until)
guard currentEnvironmentIdentity == environment else { return }
let snoozedAt = until.map { _ in Date.now }
Expand All@@ -329,9 +331,10 @@ public final class FeatureRootModel {
}
}

public func setPinned(_ id: String, pinned: Bool) async {
@discardableResult
public func setPinned(_ id: String, pinned: Bool) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadPinned(id: id, pinned: pinned)
guard currentEnvironmentIdentity == environment else { return }
mutateThread(id: id) {
Expand Down
190 changes: 139 additions & 51 deletions apps/swift-ios/Features/Workspace/HomeThreadCollectionView.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,43 @@
import SwiftUI
import UIKit

enum HomeThreadSwipeActionKind: Equatable, Sendable {
case restore
case unpin
case settle
case reopen
case archive
case delete
}

struct HomeThreadSwipeActionPlan: Equatable, Sendable {
let actions: [HomeThreadSwipeActionKind]
let performsFirstActionWithFullSwipe: Bool

static func make(
thread: FeatureThread,
isArchived: Bool,
now: Date
) -> HomeThreadSwipeActionPlan {
let primary: HomeThreadSwipeActionKind
if isArchived {
primary = .restore
} else if thread.pinnedAt != nil, thread.canTogglePin {
primary = .unpin
} else if thread.canToggleSettlement {
primary = thread.isEffectivelySettled(at: now)
? .reopen
: .settle
} else {
primary = .archive
}
return HomeThreadSwipeActionPlan(
actions: [primary, .delete],
performsFirstActionWithFullSwipe: primary == .settle || primary == .reopen
)
}
}

/// A recycled, diffable Home surface. SwiftUI still owns the surrounding shell,
/// while UIKit keeps row creation and updates proportional to visible threads.
struct HomeThreadCollectionView: UIViewRepresentable {
Expand All@@ -18,11 +55,14 @@ struct HomeThreadCollectionView: UIViewRepresentable {
let onToggleSettled: () -> Void
let onToggleArchive: () -> Void
let onShowMoreSettled: () -> Void
let newThreadAvailability: (FeatureThread) -> ThreadNewTaskAvailability
let onNewThreadOnSameBranch: (ThreadNewTaskSeedRequest) -> Void
let onRename: (FeatureThread) -> Void
let onArchive: (FeatureThread, Bool) -> Void
let onSettle: (FeatureThread, Bool) -> Void
let onSnooze: (FeatureThread, Date?) -> Void
let onPin: (FeatureThread, Bool) -> Void
let projectPath: (FeatureThread) -> String?
let onDelete: (FeatureThread) -> Void

func makeCoordinator() -> Coordinator {
Expand DownExpand Up@@ -193,55 +233,74 @@ struct HomeThreadCollectionView: UIViewRepresentable {
return nil
}

let delete = UIContextualAction(style: .destructive, title: "Delete") { [weak self] _, _, finish in
self?.parent.onDelete(thread)
finish(true)
}
delete.image = UIImage(systemName: "trash")
let plan = HomeThreadSwipeActionPlan.make(
thread: thread,
isArchived: isArchived,
now: .now
)
let actions = plan.actions.map { swipeAction($0, for: thread) }
let configuration = UISwipeActionsConfiguration(actions: actions)
configuration.performsFirstActionWithFullSwipe =
plan.performsFirstActionWithFullSwipe
return configuration
}

let primaryAction: UIContextualAction
if isArchived {
primaryAction = UIContextualAction(style: .normal, title: "Restore") {
private func swipeAction(
_ kind: HomeThreadSwipeActionKind,
for thread: FeatureThread
) -> UIContextualAction {
let action: UIContextualAction
switch kind {
case .restore:
action = UIContextualAction(style: .normal, title: "Restore") {
[weak self] _, _, finish in
self?.parent.onArchive(thread, false)
finish(true)
}
primaryAction.image = UIImage(systemName: "arrow.uturn.backward")
primaryAction.backgroundColor = .systemBlue
} else if thread.pinnedAt != nil, thread.canTogglePin {
primaryAction = UIContextualAction(style: .normal, title: "Unpin") {
action.image = UIImage(systemName: "arrow.uturn.backward")
action.backgroundColor = .systemBlue
case .unpin:
action = UIContextualAction(style: .normal, title: "Unpin") {
[weak self] _, _, finish in
self?.parent.onPin(thread, false)
finish(true)
}
primaryAction.image = UIImage(systemName: "pin.slash")
primaryAction.backgroundColor = .systemBlue
} else if thread.canToggleSettlement {
let isSettled = thread.isEffectivelySettled(at: .now)
primaryAction = UIContextualAction(
action.image = UIImage(systemName: "pin.slash")
action.backgroundColor = .systemBlue
case .settle, .reopen:
let wasSettled = kind == .reopen
action = UIContextualAction(
style: .normal,
title: isSettled ? "Reopen" : "Settle"
title: wasSettled ? "Reopen" : "Settle"
) { [weak self] _, _, finish in
self?.parent.onSettle(thread, !isSettled)
self?.parent.onSettle(thread, !wasSettled)
finish(true)
}
primaryAction.image = UIImage(
systemName: isSettled ? "arrow.counterclockwise" : "checkmark"
action.image = UIImage(
systemName: wasSettled ? "arrow.counterclockwise" : "checkmark"
)
primaryAction.backgroundColor = isSettled ? .systemBlue : .systemGreen
} else {
primaryAction = UIContextualAction(style: .normal, title: "Archive") {
action.backgroundColor = wasSettled ? .systemBlue : .systemGreen
case .archive:
action = UIContextualAction(style: .normal, title: "Archive") {
[weak self] _, _, finish in
self?.parent.onArchive(thread, true)
finish(true)
}
primaryAction.image = UIImage(systemName: "archivebox")
primaryAction.backgroundColor = .systemGray
action.image = UIImage(systemName: "archivebox")
action.backgroundColor = .systemGray
case .delete:
action = UIContextualAction(style: .normal, title: "Delete") {
[weak self] _, _, finish in
self?.parent.onDelete(thread)
// The alert owns the destructive operation. Complete this
// non-destructive contextual action so Cancel closes the
// swipe without UIKit animating a row deletion.
finish(true)
}
action.image = UIImage(systemName: "trash")
action.backgroundColor = .systemRed
}

let configuration = UISwipeActionsConfiguration(actions: [delete, primaryAction])
configuration.performsFirstActionWithFullSwipe = false
return configuration
return action
}

private func configure(
Expand DownExpand Up@@ -380,6 +439,17 @@ struct HomeThreadCollectionView: UIViewRepresentable {
}

private func menuActions(for thread: FeatureThread, isArchived: Bool) -> [UIMenuElement] {
let newThreadAvailability = parent.newThreadAvailability(thread)
let newThread = UIAction(
title: newThreadAvailability.menuTitle,
image: UIImage(systemName: "plus.bubble")
) { [weak self] _ in
guard case let .available(request) = newThreadAvailability else { return }
self?.parent.onNewThreadOnSameBranch(request)
}
if !newThreadAvailability.isEnabled {
newThread.attributes = .disabled
}
let rename = UIAction(title: "Rename", image: UIImage(systemName: "pencil")) { [weak self] _ in
self?.parent.onRename(thread)
}
Expand All@@ -390,7 +460,7 @@ struct HomeThreadCollectionView: UIViewRepresentable {
self?.parent.onArchive(thread, !isArchived)
}

var actions: [UIMenuElement] = [rename, archive]
var actions: [UIMenuElement] = [newThread, rename, archive]
if !isArchived {
if thread.canTogglePin {
let isPinned = thread.pinnedAt != nil
Expand All@@ -404,39 +474,57 @@ struct HomeThreadCollectionView: UIViewRepresentable {
)
}
if thread.canToggleSettlement {
let isSettled = thread.isEffectivelySettled(at: .now)
let wasSettled = thread.isSettled || thread.isEffectivelySettled(at: .now)
actions.append(
UIAction(
title: isSettled ? "Reopen" : "Settle",
title: wasSettled ? "Reopen" : "Settle",
image: UIImage(
systemName: isSettled ? "arrow.counterclockwise" : "checkmark"
systemName: wasSettled ? "arrow.counterclockwise" : "checkmark"
)
) { [weak self] _ in
self?.parent.onSettle(thread, !isSettled)
self?.parent.onSettle(thread, !wasSettled)
}
)
}

if thread.canToggleSnooze {
let isSnoozed = thread.isEffectivelySnoozed(at: .now)
let snooze = UIAction(
title: isSnoozed ? "Unsnooze" : "Snooze 1 hour",
image: UIImage(systemName: isSnoozed ? "bell" : "clock")
) { [weak self] _ in
self?.parent.onSnooze(
thread,
isSnoozed ? nil : Date.now.addingTimeInterval(60 * 60)
)
}
if thread.state == .queued
|| thread.state == .waitingForApproval
|| thread.state == .waitingForInput {
snooze.attributes = .disabled
switch ThreadSnoozeMenuModel.menu(for: thread, isArchived: isArchived) {
case .hidden:
break
case .unsnooze:
actions.append(
UIAction(title: "Unsnooze", image: UIImage(systemName: "bell")) {
[weak self] _ in
self?.parent.onSnooze(thread, nil)
}
)
case let .presets(presets, enabled):
let presetActions = presets.map { preset in
let action = UIAction(title: preset.menuTitle) { [weak self] _ in
self?.parent.onSnooze(thread, preset.until)
}
if !enabled { action.attributes = .disabled }
return action
}
actions.append(snooze)
actions.append(
UIMenu(
title: "Snooze",
image: UIImage(systemName: "clock"),
children: presetActions
)
)
}
}

let copyItems = ThreadMetadataCopyModel.items(
for: thread,
projectPath: parent.projectPath(thread)
)
actions.append(contentsOf: copyItems.map { item in
UIAction(title: item.title, image: UIImage(systemName: item.systemImage)) { _ in
ThreadMetadataClipboard.copy(item)
}
})

actions.append(
UIAction(title: "Delete", image: UIImage(systemName: "trash"), attributes: .destructive) {
[weak self] _ in
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

feat(swift-ios): start a new thread on the same branch#6136

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

Closed
saphid wants to merge 16 commits into from
Closed

feat(swift-ios): start a new thread on the same branch #6136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2f9f976
feat(swiftui): offer undo after settling thread
saphid Aug 11, 2026
c489281
fix(swiftui): confirm destructive thread deletion
saphid Aug 11, 2026
668a513
fix(swiftui): make settle the primary full-swipe action
saphid Aug 11, 2026
4ecd669
fix(swiftui): harden swipe safety state transitions
saphid Aug 11, 2026
3f90545
fix(swift-ios): close swipe safety review gaps
saphid Aug 11, 2026
f19679e
fix(swift-ios): make swipe recovery state exact
saphid Aug 11, 2026
de7e2fd
Polish swipe confirmation and undo validation
saphid Aug 11, 2026
5d5b565
Close swipe safety race conditions
saphid Aug 11, 2026
6aead64
test(swift-ios): harden settle undo races
saphid Aug 11, 2026
f966d52
fix(swift-ios): dismiss stale delete confirmation
saphid Aug 11, 2026
c767324
fix(swift-ios): dismiss stale delete confirmation
saphid Aug 11, 2026
2662960
fix(swift-ios): serialize settle undo actions
saphid Aug 11, 2026
3956fef
test(swift-ios): use environment provider catalogs
saphid Aug 11, 2026
e11dbaa
feat(swift-ios): copy thread metadata from rows
saphid Aug 10, 2026
b2e4f91
feat(swift-ios): add richer snooze presets
saphid Aug 10, 2026
2735404
feat(swift-ios): start threads on the same branch
saphid Aug 10, 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
15 changes: 9 additions & 6 deletions apps/swift-ios/Features/Root/FeatureRootModel.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -299,9 +299,10 @@ public final class FeatureRootModel {
}
}

public func setSettled(_ id: String, settled: Bool) async {
@discardableResult
public func setSettled(_ id: String, settled: Bool) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadSettled(id: id, settled: settled)
guard currentEnvironmentIdentity == environment else { return }
let settledAt = settled ? Date.now : nil
Expand All@@ -316,9 +317,10 @@ public final class FeatureRootModel {
}
}

public func setSnoozed(_ id: String, until: Date?) async {
@discardableResult
public func setSnoozed(_ id: String, until: Date?) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadSnoozed(id: id, until: until)
guard currentEnvironmentIdentity == environment else { return }
let snoozedAt = until.map { _ in Date.now }
Expand All@@ -329,9 +331,10 @@ public final class FeatureRootModel {
}
}

public func setPinned(_ id: String, pinned: Bool) async {
@discardableResult
public func setPinned(_ id: String, pinned: Bool) async -> Bool {
let environment = currentEnvironmentIdentity
await perform {
return await perform {
try await client.setThreadPinned(id: id, pinned: pinned)
guard currentEnvironmentIdentity == environment else { return }
mutateThread(id: id) {
Expand Down
190 changes: 139 additions & 51 deletions apps/swift-ios/Features/Workspace/HomeThreadCollectionView.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,43 @@
import SwiftUI
import UIKit

enum HomeThreadSwipeActionKind: Equatable, Sendable {
case restore
case unpin
case settle
case reopen
case archive
case delete
}

struct HomeThreadSwipeActionPlan: Equatable, Sendable {
let actions: [HomeThreadSwipeActionKind]
let performsFirstActionWithFullSwipe: Bool

static func make(
thread: FeatureThread,
isArchived: Bool,
now: Date
) -> HomeThreadSwipeActionPlan {
let primary: HomeThreadSwipeActionKind
if isArchived {
primary = .restore
} else if thread.pinnedAt != nil, thread.canTogglePin {
primary = .unpin
} else if thread.canToggleSettlement {
primary = thread.isEffectivelySettled(at: now)
? .reopen
: .settle
} else {
primary = .archive
}
return HomeThreadSwipeActionPlan(
actions: [primary, .delete],
performsFirstActionWithFullSwipe: primary == .settle || primary == .reopen
)
}
}

/// A recycled, diffable Home surface. SwiftUI still owns the surrounding shell,
/// while UIKit keeps row creation and updates proportional to visible threads.
struct HomeThreadCollectionView: UIViewRepresentable {
Expand All@@ -18,11 +55,14 @@ struct HomeThreadCollectionView: UIViewRepresentable {
let onToggleSettled: () -> Void
let onToggleArchive: () -> Void
let onShowMoreSettled: () -> Void
let newThreadAvailability: (FeatureThread) -> ThreadNewTaskAvailability
let onNewThreadOnSameBranch: (ThreadNewTaskSeedRequest) -> Void
let onRename: (FeatureThread) -> Void
let onArchive: (FeatureThread, Bool) -> Void
let onSettle: (FeatureThread, Bool) -> Void
let onSnooze: (FeatureThread, Date?) -> Void
let onPin: (FeatureThread, Bool) -> Void
let projectPath: (FeatureThread) -> String?
let onDelete: (FeatureThread) -> Void

func makeCoordinator() -> Coordinator {
Expand DownExpand Up@@ -193,55 +233,74 @@ struct HomeThreadCollectionView: UIViewRepresentable {
return nil
}

let delete = UIContextualAction(style: .destructive, title: "Delete") { [weak self] _, _, finish in
self?.parent.onDelete(thread)
finish(true)
}
delete.image = UIImage(systemName: "trash")
let plan = HomeThreadSwipeActionPlan.make(
thread: thread,
isArchived: isArchived,
now: .now
)
let actions = plan.actions.map { swipeAction($0, for: thread) }
let configuration = UISwipeActionsConfiguration(actions: actions)
configuration.performsFirstActionWithFullSwipe =
plan.performsFirstActionWithFullSwipe
return configuration
}

let primaryAction: UIContextualAction
if isArchived {
primaryAction = UIContextualAction(style: .normal, title: "Restore") {
private func swipeAction(
_ kind: HomeThreadSwipeActionKind,
for thread: FeatureThread
) -> UIContextualAction {
let action: UIContextualAction
switch kind {
case .restore:
action = UIContextualAction(style: .normal, title: "Restore") {
[weak self] _, _, finish in
self?.parent.onArchive(thread, false)
finish(true)
}
primaryAction.image = UIImage(systemName: "arrow.uturn.backward")
primaryAction.backgroundColor = .systemBlue
} else if thread.pinnedAt != nil, thread.canTogglePin {
primaryAction = UIContextualAction(style: .normal, title: "Unpin") {
action.image = UIImage(systemName: "arrow.uturn.backward")
action.backgroundColor = .systemBlue
case .unpin:
action = UIContextualAction(style: .normal, title: "Unpin") {
[weak self] _, _, finish in
self?.parent.onPin(thread, false)
finish(true)
}
primaryAction.image = UIImage(systemName: "pin.slash")
primaryAction.backgroundColor = .systemBlue
} else if thread.canToggleSettlement {
let isSettled = thread.isEffectivelySettled(at: .now)
primaryAction = UIContextualAction(
action.image = UIImage(systemName: "pin.slash")
action.backgroundColor = .systemBlue
case .settle, .reopen:
let wasSettled = kind == .reopen
action = UIContextualAction(
style: .normal,
title: isSettled ? "Reopen" : "Settle"
title: wasSettled ? "Reopen" : "Settle"
) { [weak self] _, _, finish in
self?.parent.onSettle(thread, !isSettled)
self?.parent.onSettle(thread, !wasSettled)
finish(true)
}
primaryAction.image = UIImage(
systemName: isSettled ? "arrow.counterclockwise" : "checkmark"
action.image = UIImage(
systemName: wasSettled ? "arrow.counterclockwise" : "checkmark"
)
primaryAction.backgroundColor = isSettled ? .systemBlue : .systemGreen
} else {
primaryAction = UIContextualAction(style: .normal, title: "Archive") {
action.backgroundColor = wasSettled ? .systemBlue : .systemGreen
case .archive:
action = UIContextualAction(style: .normal, title: "Archive") {
[weak self] _, _, finish in
self?.parent.onArchive(thread, true)
finish(true)
}
primaryAction.image = UIImage(systemName: "archivebox")
primaryAction.backgroundColor = .systemGray
action.image = UIImage(systemName: "archivebox")
action.backgroundColor = .systemGray
case .delete:
action = UIContextualAction(style: .normal, title: "Delete") {
[weak self] _, _, finish in
self?.parent.onDelete(thread)
// The alert owns the destructive operation. Complete this
// non-destructive contextual action so Cancel closes the
// swipe without UIKit animating a row deletion.
finish(true)
}
action.image = UIImage(systemName: "trash")
action.backgroundColor = .systemRed
}

let configuration = UISwipeActionsConfiguration(actions: [delete, primaryAction])
configuration.performsFirstActionWithFullSwipe = false
return configuration
return action
}

private func configure(
Expand DownExpand Up@@ -380,6 +439,17 @@ struct HomeThreadCollectionView: UIViewRepresentable {
}

private func menuActions(for thread: FeatureThread, isArchived: Bool) -> [UIMenuElement] {
let newThreadAvailability = parent.newThreadAvailability(thread)
let newThread = UIAction(
title: newThreadAvailability.menuTitle,
image: UIImage(systemName: "plus.bubble")
) { [weak self] _ in
guard case let .available(request) = newThreadAvailability else { return }
self?.parent.onNewThreadOnSameBranch(request)
}
if !newThreadAvailability.isEnabled {
newThread.attributes = .disabled
}
let rename = UIAction(title: "Rename", image: UIImage(systemName: "pencil")) { [weak self] _ in
self?.parent.onRename(thread)
}
Expand All@@ -390,7 +460,7 @@ struct HomeThreadCollectionView: UIViewRepresentable {
self?.parent.onArchive(thread, !isArchived)
}

var actions: [UIMenuElement] = [rename, archive]
var actions: [UIMenuElement] = [newThread, rename, archive]
if !isArchived {
if thread.canTogglePin {
let isPinned = thread.pinnedAt != nil
Expand All@@ -404,39 +474,57 @@ struct HomeThreadCollectionView: UIViewRepresentable {
)
}
if thread.canToggleSettlement {
let isSettled = thread.isEffectivelySettled(at: .now)
let wasSettled = thread.isSettled || thread.isEffectivelySettled(at: .now)
actions.append(
UIAction(
title: isSettled ? "Reopen" : "Settle",
title: wasSettled ? "Reopen" : "Settle",
image: UIImage(
systemName: isSettled ? "arrow.counterclockwise" : "checkmark"
systemName: wasSettled ? "arrow.counterclockwise" : "checkmark"
)
) { [weak self] _ in
self?.parent.onSettle(thread, !isSettled)
self?.parent.onSettle(thread, !wasSettled)
}
)
}

if thread.canToggleSnooze {
let isSnoozed = thread.isEffectivelySnoozed(at: .now)
let snooze = UIAction(
title: isSnoozed ? "Unsnooze" : "Snooze 1 hour",
image: UIImage(systemName: isSnoozed ? "bell" : "clock")
) { [weak self] _ in
self?.parent.onSnooze(
thread,
isSnoozed ? nil : Date.now.addingTimeInterval(60 * 60)
)
}
if thread.state == .queued
|| thread.state == .waitingForApproval
|| thread.state == .waitingForInput {
snooze.attributes = .disabled
switch ThreadSnoozeMenuModel.menu(for: thread, isArchived: isArchived) {
case .hidden:
break
case .unsnooze:
actions.append(
UIAction(title: "Unsnooze", image: UIImage(systemName: "bell")) {
[weak self] _ in
self?.parent.onSnooze(thread, nil)
}
)
case let .presets(presets, enabled):
let presetActions = presets.map { preset in
let action = UIAction(title: preset.menuTitle) { [weak self] _ in
self?.parent.onSnooze(thread, preset.until)
}
if !enabled { action.attributes = .disabled }
return action
}
actions.append(snooze)
actions.append(
UIMenu(
title: "Snooze",
image: UIImage(systemName: "clock"),
children: presetActions
)
)
}
}

let copyItems = ThreadMetadataCopyModel.items(
for: thread,
projectPath: parent.projectPath(thread)
)
actions.append(contentsOf: copyItems.map { item in
UIAction(title: item.title, image: UIImage(systemName: item.systemImage)) { _ in
ThreadMetadataClipboard.copy(item)
}
})

actions.append(
UIAction(title: "Delete", image: UIImage(systemName: "trash"), attributes: .destructive) {
[weak self] _ in
Expand Down
Loading
Loading