Compare commits

...
Author SHA1 Message Date
buzzert 7c15357108 fix(ios): restore Quick Question composer behavior
TestFlight / Build and upload (push) Successful in 1m53s
2026-11-17 21:44:44 -08:00
buzzert ea6ee8cc64 feat(ios): submit Quick Question on Return
TestFlight / Build and upload (push) Successful in 1m57s
2026-11-17 20:53:18 -08:00
2 changed files with 31 additions and 153 deletions
@@ -9,7 +9,6 @@ struct SybilQuickQuestionView: View {
@Environment(\.dismiss) private var dismiss
@FocusState private var promptFocused: Bool
@State private var promptSelection: TextSelection?
@State private var autoSelectedFocusRequest: Int?
private var hasAnswerContent: Bool {
!viewModel.quickQuestionMessages.isEmpty || viewModel.quickQuestionError != nil
@@ -32,45 +31,14 @@ struct SybilQuickQuestionView: View {
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
.background(SybilTheme.backgroundGradient)
.preferredColorScheme(.dark)
.onChange(of: promptFocused) { _, isFocused in
guard isFocused else {
return
}
selectInitialPromptIfNeeded(for: focusRequest)
}
.task(id: focusRequest) {
promptFocused = false
promptSelection = nil
autoSelectedFocusRequest = nil
try? await Task.sleep(for: .milliseconds(260))
guard !Task.isCancelled else {
return
}
promptFocused = true
}
}
private func selectInitialPromptIfNeeded(for request: Int) {
guard autoSelectedFocusRequest != request else {
return
}
autoSelectedFocusRequest = request
let initialPrompt = viewModel.quickQuestionPrompt
guard !initialPrompt.isEmpty else {
return
}
// Let SwiftUI apply focus before publishing the selection update.
Task { @MainActor in
await Task.yield()
guard promptFocused,
focusRequest == request,
viewModel.quickQuestionPrompt == initialPrompt
else {
return
}
promptSelection = TextSelection(range: initialPrompt.startIndex..<initialPrompt.endIndex)
let prompt = viewModel.quickQuestionPrompt
promptSelection = TextSelection(range: prompt.startIndex..<prompt.endIndex)
}
}
@@ -135,10 +103,9 @@ struct SybilQuickQuestionView: View {
),
focused: $promptFocused,
selection: $promptSelection,
axis: .vertical,
axis: .horizontal,
submit: submitQuestion
)
.accessibilityIdentifier("quick-question-prompt")
SybilPromptSendButton(canSend: viewModel.canSendQuickQuestion, submit: submitQuestion)
.accessibilityLabel("Ask quick question")
@@ -241,7 +208,6 @@ struct SybilQuickQuestionView: View {
}
}
private struct QuickQuestionPickerPill: View {
var title: String
@@ -1,7 +1,6 @@
import XCTest
import UIKit
/// Uses the repository's 127.0.0.1 contract fixture and the real iOS home-screen shortcut.
/// Exercises Quick Question through its real home-screen action and shared SwiftUI field.
@MainActor
final class QuickQuestionSelectionUITests: XCTestCase {
private let app = XCUIApplication()
@@ -18,119 +17,49 @@ final class QuickQuestionSelectionUITests: XCTestCase {
override func tearDown() async throws {
app.terminate()
UIPasteboard.general.string = nil
}
func testQuickActionReselectsRetainedDraft() async throws {
func testQuickQuestionKeepsKeyboardVisibleAcrossSeparateKeypressesAndStaysCompact() {
app.launch()
openQuickQuestionFromHomeScreen()
let prompt = quickQuestionPromptElement()
let prompt = quickQuestionPrompt()
XCTAssertTrue(prompt.waitForExistence(timeout: 10))
XCTAssertTrue(app.keyboards.firstMatch.waitForExistence(timeout: 10))
XCTAssertLessThan(prompt.frame.height, 80, "Quick Question should retain its original compact single-line field.")
prompt.typeText("a")
XCTAssertTrue(app.keyboards.firstMatch.exists, "Keyboard should remain visible after the first keypress.")
prompt.typeText("b")
XCTAssertTrue(app.keyboards.firstMatch.exists, "Keyboard should remain visible after the second keypress.")
prompt.typeText("c")
XCTAssertTrue(app.keyboards.firstMatch.exists, "Keyboard should remain visible after the third keypress.")
XCTAssertEqual(prompt.value as? String, "abc")
}
func testQuickQuestionReappearanceSelectsRetainedDraftForReplacement() {
app.launch()
openQuickQuestionFromHomeScreen()
let prompt = quickQuestionPrompt()
XCTAssertTrue(prompt.waitForExistence(timeout: 10))
XCTAssertTrue(app.keyboards.firstMatch.waitForExistence(timeout: 10))
XCTAssertLessThan(prompt.frame.height, 80, "An empty Quick Question composer should stay one line tall.")
prompt.typeText("retained draft")
XCTAssertEqual(prompt.value as? String, "retained draft")
// The real home-screen action requests a new focusRequest even while
// this sheet remains presented. That task refocuses and reselects text.
// A second real home-screen Quick Question action advances the existing
// focus request. The original TextSelection binding selects the draft.
openQuickQuestionFromHomeScreen()
XCTAssertTrue(prompt.waitForExistence(timeout: 10))
XCTAssertTrue(app.keyboards.firstMatch.waitForExistence(timeout: 10))
XCTAssertEqual(prompt.value as? String, "retained draft")
XCTAssertLessThan(prompt.frame.height, 80, "A one-line draft should keep the normal chat composer height.")
// The field is already focused with its initial draft selected. Do not tap
// it here: typing immediately is the behavior under test.
prompt.typeText("replacement")
XCTAssertEqual(prompt.value as? String, "replacement")
}
func testQuickQuestionComposerStartsCompactAndGrowsForMultilineText() {
app.launch()
openQuickQuestionFromHomeScreen()
let prompt = quickQuestionPromptElement()
XCTAssertTrue(prompt.waitForExistence(timeout: 10))
XCTAssertTrue(app.keyboards.firstMatch.waitForExistence(timeout: 10))
let oneLineHeight = prompt.frame.height
XCTAssertLessThan(oneLineHeight, 80, "The Quick Question field must not fill the sheet when empty.")
captureFrame("quick-question-empty-keyboard-visible", element: prompt)
capture("quick-question-empty-keyboard-visible")
let growingDraft = (1...4).map { "Question line \($0)" }.joined(separator: "\n")
UIPasteboard.general.string = growingDraft
prompt.press(forDuration: 1.2)
let paste = app.descendants(matching: .any)
.matching(NSPredicate(format: "label == %@", "Paste"))
.firstMatch
XCTAssertTrue(paste.waitForExistence(timeout: 5), "The multiline fixture should be available to paste into the real text field.")
paste.tap()
XCTAssertEqual(prompt.value as? String, growingDraft)
let multilineHeight = prompt.frame.height
captureFrame("quick-question-multiline-growing-keyboard-visible", element: prompt)
capture("quick-question-multiline-growing-keyboard-visible")
XCTAssertGreaterThan(multilineHeight, oneLineHeight * 2, "The shared vertical field should grow as lines are added.")
XCTAssertLessThan(multilineHeight, oneLineHeight * 6 + 16, "The growing field should remain below its six-line cap.")
let appendedLines = (5...9).map { "\nQuestion line \($0)" }.joined()
prompt.typeText(appendedLines)
let cappedDraft = growingDraft + appendedLines
XCTAssertEqual(prompt.value as? String, cappedDraft)
let cappedHeight = prompt.frame.height
captureFrame("quick-question-six-line-cap-keyboard-visible", element: prompt)
capture("quick-question-six-line-cap-keyboard-visible")
XCTAssertGreaterThan(cappedHeight, oneLineHeight * 5, "Nine lines should reach the existing six-line height cap.")
XCTAssertLessThan(cappedHeight, oneLineHeight * 6 + 16, "Nine lines should remain inside the existing six-line visual cap.")
XCTAssertEqual(
prompt.value as? String,
cappedDraft,
"The capped field must retain all nine lines while its visible editor stays at the six-line cap."
)
}
func testQuickQuestionOneLineHeightMatchesNormalChatComposer() {
app.launch()
let agentButton = app.buttons["agent-sidebar"]
if !agentButton.waitForExistence(timeout: 2) || !agentButton.isHittable {
let showSidebar = app.buttons["Show sidebar"]
XCTAssertTrue(showSidebar.waitForExistence(timeout: 15))
showSidebar.tap()
}
XCTAssertTrue(agentButton.waitForExistence(timeout: 5))
agentButton.tap()
let textField = app.textFields["agent-composer"]
let textView = app.textViews["agent-composer"]
XCTAssertTrue(textField.waitForExistence(timeout: 5) || textView.waitForExistence(timeout: 5))
let normalComposer = textField.exists ? textField : textView
let normalHeight = normalComposer.frame.height
XCTAssertLessThan(normalHeight, 80, "The normal-chat composer should start at one line.")
captureFrame("normal-chat-composer", element: normalComposer)
capture("normal-chat-one-line-keyboard-hidden")
XCUIDevice.shared.press(.home)
openQuickQuestionFromHomeScreen()
let prompt = quickQuestionPromptElement()
XCTAssertTrue(prompt.waitForExistence(timeout: 10))
XCTAssertTrue(app.keyboards.firstMatch.waitForExistence(timeout: 10))
let quickQuestionHeight = prompt.frame.height
captureFrame("quick-question-composer-keyboard-visible", element: prompt)
capture("quick-question-one-line-keyboard-visible")
XCTAssertLessThan(quickQuestionHeight, 80, "Quick Question should start at one line.")
XCTAssertEqual(
quickQuestionHeight,
normalHeight,
accuracy: 4,
"Quick Question should use the same one-line field sizing as normal chat."
)
}
private func quickQuestionPromptElement() -> XCUIElement {
let textField = app.textFields["quick-question-prompt"]
return textField.exists ? textField : app.textViews["quick-question-prompt"]
private func quickQuestionPrompt() -> XCUIElement {
app.textFields["Ask anything..."]
}
private func openQuickQuestionFromHomeScreen() {
@@ -138,12 +67,10 @@ final class QuickQuestionSelectionUITests: XCTestCase {
let sybilIcon = springboard.icons.matching(identifier: "Sybil").firstMatch
XCTAssertTrue(sybilIcon.waitForExistence(timeout: 10))
let homeScreen = springboard.otherElements["Home screen icons"]
XCTAssertTrue(homeScreen.waitForExistence(timeout: 5))
for _ in 0..<2 {
guard !sybilIcon.isHittable else {
break
if !sybilIcon.isHittable, homeScreen.waitForExistence(timeout: 5) {
for _ in 0..<2 where !sybilIcon.isHittable {
homeScreen.swipeLeft()
}
homeScreen.swipeLeft()
}
XCTAssertTrue(sybilIcon.isHittable, "Navigate to the home-screen page containing Sybil before opening its quick action.")
sybilIcon.press(forDuration: 1.2)
@@ -153,21 +80,6 @@ final class QuickQuestionSelectionUITests: XCTestCase {
quickQuestion.tap()
}
private func capture(_ name: String) {
let attachment = XCTAttachment(screenshot: app.screenshot())
attachment.name = name
attachment.lifetime = .keepAlways
add(attachment)
}
private func captureFrame(_ name: String, element: XCUIElement) {
let frame = element.frame
let attachment = XCTAttachment(string: "x=\(frame.origin.x), y=\(frame.origin.y), width=\(frame.width), height=\(frame.height)")
attachment.name = "frame-\(name)"
attachment.lifetime = .keepAlways
add(attachment)
}
private func control(_ body: [String: Any]) async throws {
var request = URLRequest(url: URL(string: "http://127.0.0.1:8799/control")!)
request.httpMethod = "POST"