镜像站点 · 本页由第三方 GitHub 只读镜像提供，非 GitHub 官方站点，不接受任何登录或凭据输入。前往 github.com
Skip to content

feat(swiftui): add a resizable iPad workspace inspector #67

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

Draft
saphid wants to merge 1 commit into
base: phone/swiftui-ipad-sidebar-20260912
Choose a base branch
from
+344 −132
Draft

feat(swiftui): add a resizable iPad workspace inspector #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 75 additions & 0 deletions apps/swift-ios/Features/Chat/FeatureWorkspaceToolPanel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import SwiftUI

struct FeatureWorkspaceToolPanel: View {
let client: any FeatureClient
let threadID: String
let workspaceRoot: String?
let surface: FeatureThreadToolSurface
let onSelect: (FeatureThreadToolSurface) -> Void
let onClose: () -> Void

var body: some View {
NavigationStack {
Group {
switch surface {
case .files:
FeatureFilesView(
client: client,
threadID: threadID,
workspaceRoot: workspaceRoot
)
case let .file(path):
FeatureFilesView(
client: client,
threadID: threadID,
initialPath: path,
workspaceRoot: workspaceRoot
)
case .review:
FeatureReviewView(client: client, threadID: threadID)
case .sourceControl:
FeatureSourceControlView(client: client, threadID: threadID)
case .terminal:
FeatureTerminalView(client: client, threadID: threadID)
}
}
.toolbar {
ToolbarItem(placement: .topBarLeading) {
Menu {
Button("Files", systemImage: "folder") { onSelect(.files) }
Button("Review changes", systemImage: "doc.text.magnifyingglass") { onSelect(.review) }
Button("Source control", systemImage: "arrow.triangle.branch") { onSelect(.sourceControl) }
Button("Terminal", systemImage: "terminal") { onSelect(.terminal) }
} label: {
Label("Workspace tools", systemImage: "square.grid.2x2")
}
.accessibilityIdentifier("workspace-panel-tools")
}
ToolbarItem(placement: .confirmationAction) {
Button("Done") { onClose() }
.accessibilityIdentifier("workspace-panel-close")
}
}
}
.id(surface.id)
}
}

public enum FeatureThreadToolSurface: Identifiable {
case files
case file(String)
case review
case sourceControl
case terminal

public var id: String {
switch self {
case .files: "files"
case let .file(path): "file:\(path)"
case .review: "review"
case .sourceControl: "sourceControl"
case .terminal: "terminal"
}
}
}

251 changes: 124 additions & 127 deletions apps/swift-ios/Features/Chat/ThreadDetailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ public struct ThreadDetailView: View {
@State private var didRestoreDraft = false
@State private var draftSaveTask: Task<Void, Never>?
@State private var draftSaveError: String?
@State private var toolSurface: FeatureThreadToolSurface?
private let workspaceToolSurface: Binding<FeatureThreadToolSurface?>?
@State private var localToolSurface: FeatureThreadToolSurface?
@State private var lastToolSurface = FeatureThreadToolSurface.files
@State private var branchPullRequest: FeaturePullRequest?
@State private var linkedMediaPreview: FeatureLinkedMediaPreview?
@State private var linkedMediaPreviewError: String?
Expand All @@ -46,129 +48,40 @@ public struct ThreadDetailView: View {
submitMessage: @escaping (FeatureMessageSubmission) async -> Bool,
onNavigateBack: @escaping () -> Void = {},
draftStore: FeatureComposerDraftStore = .shared,
managesThreadPresentation: Bool = true
managesThreadPresentation: Bool = true,
workspaceToolSurface: Binding<FeatureThreadToolSurface?>? = nil
) {
self.model = model
self.thread = thread
self.submitMessage = submitMessage
self.onNavigateBack = onNavigateBack
self.draftStore = draftStore
self.managesThreadPresentation = managesThreadPresentation
self.workspaceToolSurface = workspaceToolSurface
}

public var body: some View {
Group {
if let detail {
timeline(detail)
} else if isOpening {
FeatureThreadOpeningView()
} else {
ContentUnavailableView {
Label("Thread unavailable", systemImage: "exclamationmark.bubble")
} description: {
Text("The thread could not be loaded.")
} actions: {
Button("Retry", action: reloadThread)
}
}
}
.background(T3Colors.background)
.navigationBarTitleDisplayMode(.inline)
.navigationBarBackButtonHidden(false)
.t3NavigationChrome()
.toolbar {
ToolbarItem(placement: .principal) {
threadHeaderTitle
}
ToolbarItem(placement: .primaryAction) {
threadActionsMenu
}
}
.task(id: thread.id) {
guard managesThreadPresentation else { return }
isLoading = true
await model.runThreadPresentation(id: thread.id) {
isLoading = false
}
}
.task(id: thread.id) {
// A cached thread can already show its composer while the server
// is catching up. Local drafts must not wait for that request.
guard !didRestoreDraft else { return }
await restoreDraft(from: composerDraft, key: draftKey)
}
.task(id: pullRequestObservationID) {
await observeThreadPullRequest()
}
.task(id: workspaceCatalogID) {
if let environmentID = currentThread.environmentID, let cwd = workspaceCatalogPath,
let instanceID = selection?.providerID ?? currentSelection?.providerID {
await model.refreshWorkspaceProviders(environmentID: environmentID, cwd: cwd, instanceID: instanceID)
}
}
.environment(\.providerSetupContext, currentThread.environmentID.map {
ProviderSetupContext(model: model, environmentID: $0)
})
.onChange(of: draft) { scheduleDraftSave() }
.onChange(of: selection) { scheduleDraftSave() }
.onChange(of: threadConnectionState) { _, state in
if state == .connected,
case .failed = model.detailLoadStates[thread.id],
!isOpening {
reloadThread()
}
}
.onChange(of: scenePhase) { _, phase in
if phase != .active {
persistDraftBeforeLeaving()
}
}
.onDisappear {
visualizationOpenTask?.cancel()
visualizationOpenTask = nil
persistDraftBeforeLeaving()
}
.onChange(of: thread.id) { _, _ in
visualizationOpenTask?.cancel()
visualizationOpenTask = nil
}
.sheet(item: $toolSurface) { surface in
NavigationStack {
Group {
switch surface {
case .files:
FeatureFilesView(
client: model.client,
threadID: thread.id,
workspaceRoot: markdownImageContext?.workspaceRoot
)
case let .file(path):
FeatureFilesView(
client: model.client,
threadID: thread.id,
initialPath: path,
workspaceRoot: markdownImageContext?.workspaceRoot
)
case .review:
FeatureReviewView(client: model.client, threadID: thread.id)
case .sourceControl:
FeatureSourceControlView(client: model.client, threadID: thread.id)
case .terminal:
FeatureTerminalView(client: model.client, threadID: thread.id)
}
}
.toolbar {
ToolbarItem(placement: .cancellationAction) {
Button("Done") {
toolSurface = nil
}
}
}
}
conversationContent
.sheet(item: $localToolSurface) { surface in
FeatureWorkspaceToolPanel(
client: model.client,
threadID: thread.id,
workspaceRoot: markdownImageContext?.workspaceRoot,
surface: surface,
onSelect: { toolSurface = $0 },
onClose: { toolSurface = nil }
)
.presentationDetents([.large])
.presentationDragIndicator(.visible)
.t3CodeSizing(steps: codeSizeSteps)
}
.onChange(of: toolSurface?.id) { _, _ in
if let toolSurface { lastToolSurface = toolSurface }
}
.onChange(of: thread.id) { _, _ in
toolSurface = nil
lastToolSurface = .files
}
.alert("Message not sent", isPresented: $sendFailed) {
// Refocusing happens here rather than when the send fails: the
// alert takes first responder from the composer, so a refocus
Expand Down Expand Up @@ -278,6 +191,107 @@ public struct ThreadDetailView: View {
}
}

private var conversationContent: some View {
Group {
if let detail {
timeline(detail)
} else if isOpening {
FeatureThreadOpeningView()
} else {
ContentUnavailableView {
Label("Thread unavailable", systemImage: "exclamationmark.bubble")
} description: {
Text("The thread could not be loaded.")
} actions: {
Button("Retry", action: reloadThread)
}
}
}
.background(T3Colors.background)
.navigationBarTitleDisplayMode(.inline)
.navigationBarBackButtonHidden(false)
.t3NavigationChrome()
.toolbar {
ToolbarItem(placement: .principal) {
threadHeaderTitle
}
ToolbarItem(placement: .primaryAction) {
threadActionsMenu
}
if horizontalSizeClass == .regular {
ToolbarItem(placement: .topBarTrailing) {
Button(
toolSurface == nil ? "Show workspace panel" : "Hide workspace panel",
systemImage: "sidebar.trailing"
) {
toolSurface = toolSurface == nil ? lastToolSurface : nil
}
.keyboardShortcut("0", modifiers: [.command, .option])
.accessibilityIdentifier("thread-workspace-panel-toggle")
}
}
}
.task(id: thread.id) {
guard managesThreadPresentation else { return }
isLoading = true
await model.runThreadPresentation(id: thread.id) {
isLoading = false
}
}
.task(id: thread.id) {
// A cached thread can already show its composer while the server
// is catching up. Local drafts must not wait for that request.
guard !didRestoreDraft else { return }
await restoreDraft(from: composerDraft, key: draftKey)
}
.task(id: pullRequestObservationID) {
await observeThreadPullRequest()
}
.task(id: workspaceCatalogID) {
if let environmentID = currentThread.environmentID, let cwd = workspaceCatalogPath,
let instanceID = selection?.providerID ?? currentSelection?.providerID {
await model.refreshWorkspaceProviders(environmentID: environmentID, cwd: cwd, instanceID: instanceID)
}
}
.environment(\.providerSetupContext, currentThread.environmentID.map {
ProviderSetupContext(model: model, environmentID: $0)
})
.onChange(of: draft) { scheduleDraftSave() }
.onChange(of: selection) { scheduleDraftSave() }
.onChange(of: threadConnectionState) { _, state in
if state == .connected,
case .failed = model.detailLoadStates[thread.id],
!isOpening {
reloadThread()
}
}
.onChange(of: scenePhase) { _, phase in
if phase != .active {
persistDraftBeforeLeaving()
}
}
.onDisappear {
visualizationOpenTask?.cancel()
visualizationOpenTask = nil
persistDraftBeforeLeaving()
}
.onChange(of: thread.id) { _, _ in
visualizationOpenTask?.cancel()
visualizationOpenTask = nil
}
}

private var toolSurface: FeatureThreadToolSurface? {
get {
if let workspaceToolSurface { return workspaceToolSurface.wrappedValue }
return localToolSurface
}
nonmutating set {
if let workspaceToolSurface { workspaceToolSurface.wrappedValue = newValue }
else { localToolSurface = newValue }
}
}

private var isOpening: Bool {
if managesThreadPresentation { return isLoading }
if case .failed = model.detailLoadStates[thread.id] { return false }
Expand Down Expand Up @@ -1276,23 +1290,6 @@ private struct FeatureThreadOpeningView: View {
}
}

private enum FeatureThreadToolSurface: Identifiable {
case files
case file(String)
case review
case sourceControl
case terminal

var id: String {
switch self {
case .files: "files"
case let .file(path): "file:\(path)"
case .review: "review"
case .sourceControl: "sourceControl"
case .terminal: "terminal"
}
}
}

struct ThreadPullRequestDestination: Equatable {
let number: Int
Expand Down
Loading
Loading