Skip to content

fix(ios): await progress observer completion instead of a 1s poll #296

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
sambitcreate merged 1 commit into from
Sep 30, 2026
Merged

fix(ios): await progress observer completion instead of a 1s poll #296

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
7 changes: 7 additions & 0 deletions ios/AidenOnTheGo/Features/Remote/AidenChatFeature.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1729,6 +1729,13 @@ final class AidenChatViewModel {
isAgentRosterStale = agentRoster != nil
}

/// Await the current progress observer, if any, without cancelling it or
/// starting a new one. A finished observer releases its own handle inside
/// its task body, so this returns only after that release has happened.
func waitForProgressObservation() async {
await progressTask?.value
}

private func loadProgressSnapshot(
context: AidenRemoteRequestContext,
observationGeneration: UInt64? = nil
Expand Down
23 changes: 8 additions & 15 deletions ios/AidenOnTheGoTests/AidenChatTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,16 +300,18 @@ final class AidenChatTests: XCTestCase {
AidenChatProgressLifecycleURLProtocol.reset()
}

// Await each observer's own completion instead of polling for a fixed
// wall-clock budget: a stalled host can deliver the denial long after
// the request was counted.
model.startProgressObservation()
try await waitForProgressRequestCount(1)
try await waitForProgressObservationToStop(model)
await model.waitForProgressObservation()
XCTAssertFalse(model.isProgressObservationRunning)
XCTAssertEqual(AidenChatProgressLifecycleURLProtocol.progressRequestCount, 1)

// The first observer exited through a completed task body. A later
// activation must be able to create a fresh observer for the same chat.
model.startProgressObservation()
try await waitForProgressRequestCount(2)
try await waitForProgressObservationToStop(model)
await model.waitForProgressObservation()
XCTAssertFalse(model.isProgressObservationRunning)
XCTAssertEqual(AidenChatProgressLifecycleURLProtocol.progressRequestCount, 2)
}
Expand Down Expand Up @@ -1224,8 +1226,8 @@ final class AidenChatTests: XCTestCase {
// it while the stream-consumer hold is armed to prove it cannot steal
// the intended gate.
model.startProgressObservation()
try await waitForProgressRequestCount(1)
try await waitForProgressObservationToStop(model)
await model.waitForProgressObservation()
XCTAssertFalse(model.isProgressObservationRunning)
XCTAssertEqual(AidenChatProgressLifecycleURLProtocol.progressRequestCount, 1)
await model.send()
await fulfillment(of: [arrived], timeout: 2)
Expand Down Expand Up @@ -3164,15 +3166,6 @@ final class AidenChatTests: XCTestCase {
XCTFail("Timed out waiting for progress SSE request (expected).")
}

@MainActor
private func waitForProgressObservationToStop(_ model: AidenChatViewModel) async throws {
for _ in 0..<100 {
if !model.isProgressObservationRunning { return }
try await Task.sleep(for: .milliseconds(10))
}
XCTFail("Timed out waiting for the progress observer to finish.")
}

@MainActor
private func waitForAgentRequestCount(_ expected: Int) async throws {
for _ in 0..<200 {
Expand Down
Loading