Skip to content

Make Doctor receipts durable and scoped #232

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
papi-ux merged 1 commit into from
Aug 12, 2026
Merged

Make Doctor receipts durable and scoped #232

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
94 changes: 74 additions & 20 deletions app/src/main/java/com/papi/nova/api/PolarisApiClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,14 @@ class PolarisApiClient @JvmOverloads constructor(
.readTimeout(ARTWORK_REQUEST_TIMEOUT_SECONDS, TimeUnit.SECONDS)
.build()

@JvmStatic
internal fun buildNonRetryableHttpClient(base: OkHttpClient): OkHttpClient =
base.newBuilder()
.retryOnConnectionFailure(false)
.followRedirects(false)
.followSslRedirects(false)
.build()

// TLS session resumption against a server that intermittently rejects it (e.g. a
// missing server-side session id context) surfaces as an SSLException on an
// otherwise-healthy link; one fresh-handshake retry is the correct recovery. Only
Expand Down Expand Up @@ -929,6 +937,52 @@ class PolarisApiClient @JvmOverloads constructor(
}
}

@JvmStatic
internal fun parseDoctorActionResponse(json: JSONObject): PolarisDoctorActionResult {
val verification = json.optJSONObject("verification")
val undo = json.optJSONObject("undo")
val evidence = json.optJSONObject("evidence")
val undoAvailable = undo?.let { value ->
if (!value.has("available") || value.isNull("available")) {
null
} else {
value.opt("available") as? Boolean
}
}
return PolarisDoctorActionResult(
status = json.optBoolean("status", false),
changed = json.optBoolean("changed", false),
state = json.optString("state", ""),
message = json.optString("message", ""),
error = json.optString("error", ""),
runId = json.optString("run_id", ""),
verificationDelaySeconds = verification?.optInt("delay_seconds", 0) ?: 0,
verificationActionId = verification?.optString("action_id", "") ?: "",
undoAvailable = undoAvailable,
undoActionId = undo?.optString("action_id", "") ?: "",
evidencePacketLossPct = evidence?.optDouble("packet_loss_pct")?.takeIf { !it.isNaN() },
evidenceLatencyMs = evidence?.optDouble("latency_ms")?.takeIf { !it.isNaN() }
)
}

@JvmStatic
internal fun parseDoctorActionHttpResponse(
statusCode: Int,
responseBody: String
): PolarisDoctorActionResult {
val parsed = runCatching {
parseDoctorActionResponse(JSONObject(responseBody.ifBlank { "{}" }))
}.getOrNull()
if (statusCode == 200 && parsed != null) return parsed

return (parsed ?: PolarisDoctorActionResult(status = false)).copy(
status = false,
error = parsed?.error?.takeIf { it.isNotBlank() } ?: "Doctor action rejected",
undoAvailable = false,
undoActionId = ""
)
}

@JvmStatic
fun parseSessionStatusResponse(json: JSONObject): PolarisSessionStatus {
val controls = json.optJSONObject("controls")
Expand Down Expand Up @@ -990,7 +1044,13 @@ class PolarisApiClient @JvmOverloads constructor(
aiOptimizerEnabled = json.optBoolean("ai_optimizer_enabled", false),
mangohudConfigured = json.optBoolean("mangohud_configured", false),
controls = PolarisSessionStatus.ControlsStatus(
hostTuningAllowed = controls?.optBoolean("host_tuning_allowed", false) ?: false,
hostTuningAllowed = controls?.let { value ->
if (!value.has("host_tuning_allowed") || value.isNull("host_tuning_allowed")) {
null
} else {
value.opt("host_tuning_allowed") as? Boolean
}
},
quitAllowed = controls?.optBoolean("quit_allowed", false) ?: false,
shutdownInProgress = controls?.optBoolean("shutdown_in_progress", false) ?: false,
clientCommandsEnabled = controls?.optBoolean("client_commands_enabled", false) ?: false,
Expand Down Expand Up @@ -1292,6 +1352,13 @@ class PolarisApiClient @JvmOverloads constructor(
private fun executeWithTransientRetry(request: Request): okhttp3.Response =
runWithTransientTlsRetry(onTransient = { resetCallClient() }) { execute(request) }

private fun executeNonRetryable(request: Request): okhttp3.Response =
buildNonRetryableHttpClient(clientForCall()).newCall(
request.newBuilder()
.header("Connection", "close")
.build()
).execute()

private fun execute(request: Request) = clientForCall().newCall(
request.newBuilder()
.header("Connection", "close")
Expand Down Expand Up @@ -1882,25 +1949,12 @@ class PolarisApiClient @JvmOverloads constructor(
body.toString()
))
.build()
executeWithTransientRetry(request).use { response ->
if (response.code != 200) return null
val json = JSONObject(response.body?.string() ?: "{}")
val verification = json.optJSONObject("verification")
val undo = json.optJSONObject("undo")
val evidence = json.optJSONObject("evidence")
PolarisDoctorActionResult(
status = json.optBoolean("status", false),
changed = json.optBoolean("changed", false),
state = json.optString("state", ""),
message = json.optString("message", ""),
error = json.optString("error", ""),
runId = json.optString("run_id", ""),
verificationDelaySeconds = verification?.optInt("delay_seconds", 0) ?: 0,
verificationActionId = verification?.optString("action_id", "") ?: "",
undoAvailable = undo?.optBoolean("available", false) ?: false,
undoActionId = undo?.optString("action_id", "") ?: "",
evidencePacketLossPct = evidence?.optDouble("packet_loss_pct")?.takeIf { !it.isNaN() },
evidenceLatencyMs = evidence?.optDouble("latency_ms")?.takeIf { !it.isNaN() }
// Doctor apply, verification, and Undo advance host-side run state.
// A lost response cannot be retried safely without an idempotency key.
executeNonRetryable(request).use { response ->
parseDoctorActionHttpResponse(
statusCode = response.code,
responseBody = response.body?.string().orEmpty()
)
}
} catch (e: Exception) {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/papi/nova/api/PolarisSessionStatus.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ data class PolarisSessionStatus(
val doctor: DoctorStatus = DoctorStatus()
) {
data class ControlsStatus(
val hostTuningAllowed: Boolean = false,
val hostTuningAllowed: Boolean? = null,
val quitAllowed: Boolean = false,
val shutdownInProgress: Boolean = false,
val clientCommandsEnabled: Boolean = false,
Expand Down Expand Up @@ -374,7 +374,7 @@ data class PolarisSessionStatus(
get() = listOf(sessionModeLabel, capturePathLabel).filter { it.isNotBlank() }.joinToString(" · ")
val isViewer get() = clientRole.equals("viewer", ignoreCase = true)
val hasExplicitDisplayModeChoice get() = displayMode.explicitChoice
val canAdjustHostTuning get() = controls.hostTuningAllowed || (ownedByClient && !isViewer)
val canAdjustHostTuning get() = controls.hostTuningAllowed ?: (ownedByClient && !isViewer)
val canQuit get() = controls.quitAllowed || (ownedByClient && !isViewer)

private fun normalizeSessionModeLabel(label: String): String = when (label.trim().lowercase()) {
Expand Down Expand Up @@ -441,7 +441,7 @@ data class PolarisDoctorActionResult(
val runId: String = "",
val verificationDelaySeconds: Int = 0,
val verificationActionId: String = "",
val undoAvailable: Boolean = false,
val undoAvailable: Boolean? = null,
val undoActionId: String = "",
val evidencePacketLossPct: Double? = null,
val evidenceLatencyMs: Double? = null
Expand Down
Loading
Loading