Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Bailey Dixon
|
0213dbf5db |
@@ -16,7 +16,9 @@ function classifyCiPaths(paths) {
|
||||
android: forceAll || under(['app/', 'relay-core/', 'relay-ui/', 'ui-preview/', 'quest/', 'gradle/']) || exact([
|
||||
'build.gradle.kts', 'settings.gradle.kts', 'gradle.properties', 'gradlew', 'gradlew.bat',
|
||||
'scripts/check-android-locales.py', 'scripts/android-locale-harness.py',
|
||||
'scripts/check-android-collection-apis.py', 'scripts/check-android-release-notes.py',
|
||||
'scripts/check-android-collection-apis.py', 'scripts/check-android-native-compat.py',
|
||||
'scripts/check-android-release-notes.py',
|
||||
'scripts/tests/check_android_native_compat_test.py',
|
||||
'scripts/tests/check_android_release_notes_test.py', '.github/workflows/ci-android.yml',
|
||||
'.github/workflows/play-preflight-android.yml',
|
||||
'.github/workflows/approve-release-android.yml',
|
||||
|
||||
@@ -16,6 +16,8 @@ assert.deepEqual(classifyCiPaths(['README.md']), none);
|
||||
assert.deepEqual(classifyCiPaths(['desktop/src/cli.ts']), { ...none, desktop: true });
|
||||
assert.deepEqual(classifyCiPaths(['relay-core/src/main/kotlin/Wire.kt']), { ...none, android: true });
|
||||
assert.deepEqual(classifyCiPaths(['scripts/check-android-release-notes.py']), { ...none, android: true });
|
||||
assert.deepEqual(classifyCiPaths(['scripts/check-android-native-compat.py']), { ...none, android: true });
|
||||
assert.deepEqual(classifyCiPaths(['scripts/tests/check_android_native_compat_test.py']), { ...none, android: true });
|
||||
assert.deepEqual(classifyCiPaths(['plugin/relay/server.py']), { ...none, plugin: true });
|
||||
assert.deepEqual(classifyCiPaths(['plugin/dashboard/src/App.tsx']), { ...none, dashboard: true });
|
||||
assert.deepEqual(classifyCiPaths(['user-docs/index.md']), { ...none, docs: true });
|
||||
|
||||
@@ -33,7 +33,9 @@ on:
|
||||
- "scripts/check-android-locales.py"
|
||||
- "scripts/android-locale-harness.py"
|
||||
- "scripts/check-android-collection-apis.py"
|
||||
- "scripts/check-android-native-compat.py"
|
||||
- "scripts/check-android-release-notes.py"
|
||||
- "scripts/tests/check_android_native_compat_test.py"
|
||||
- "scripts/tests/check_android_release_notes_test.py"
|
||||
- ".github/workflows/ci-android.yml"
|
||||
- ".github/workflows/play-preflight-android.yml"
|
||||
@@ -80,6 +82,9 @@ jobs:
|
||||
python3 scripts/check-android-release-notes.py
|
||||
python3 -m unittest scripts.tests.check_android_release_notes_test
|
||||
|
||||
- name: Test Android native compatibility checker
|
||||
run: python3 -m unittest scripts.tests.check_android_native_compat_test
|
||||
|
||||
- name: Run Android lint
|
||||
run: ./gradlew lint --console=plain
|
||||
|
||||
@@ -109,6 +114,12 @@ jobs:
|
||||
- name: Build debug APK
|
||||
run: ./gradlew assembleDebug --console=plain
|
||||
|
||||
- name: Verify packaged ONNX Runtime compatibility
|
||||
run: |
|
||||
python3 scripts/check-android-native-compat.py \
|
||||
app/build/outputs/apk/googlePlay/debug/*.apk \
|
||||
app/build/outputs/apk/sideload/debug/*.apk
|
||||
|
||||
- name: Upload debug APK
|
||||
uses: actions/upload-artifact@v7
|
||||
if: ${{ github.ref == 'refs/heads/main' }}
|
||||
@@ -225,3 +236,9 @@ jobs:
|
||||
python3 scripts/check-android-collection-apis.py \
|
||||
--apk app/build/outputs/apk/googlePlay/release/*.apk \
|
||||
--apk app/build/outputs/apk/sideload/release/*.apk
|
||||
|
||||
- name: Verify packaged ONNX Runtime compatibility
|
||||
run: |
|
||||
python3 scripts/check-android-native-compat.py \
|
||||
app/build/outputs/apk/googlePlay/release/*.apk \
|
||||
app/build/outputs/apk/sideload/release/*.apk
|
||||
|
||||
@@ -263,6 +263,19 @@ jobs:
|
||||
python3 scripts/check-android-collection-apis.py \
|
||||
--apk app/build/outputs/apk/sideload/candidate/*.apk
|
||||
|
||||
- name: Verify stable packaged ONNX Runtime compatibility
|
||||
if: ${{ needs.validate.outputs.prerelease != 'true' }}
|
||||
run: |
|
||||
python3 scripts/check-android-native-compat.py \
|
||||
app/build/outputs/apk/googlePlay/release/*.apk \
|
||||
app/build/outputs/apk/sideload/release/*.apk
|
||||
|
||||
- name: Verify candidate packaged ONNX Runtime compatibility
|
||||
if: ${{ needs.validate.outputs.prerelease == 'true' }}
|
||||
run: |
|
||||
python3 scripts/check-android-native-compat.py \
|
||||
app/build/outputs/apk/sideload/candidate/*.apk
|
||||
|
||||
- name: List produced artifacts (debug aid)
|
||||
run: |
|
||||
echo "=== APK outputs ==="
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/), and this
|
||||
|
||||
### Fixed
|
||||
|
||||
- **Opening Android no longer claims or interrupts a turn already running in Hermes Desktop/TUI.** Passive foreground and session browsing now use read-only Gateway status plus profile-scoped history; live-session resume remains reserved for explicit Android actions and exact Android-owned recovery.
|
||||
- **Android wake-word detection now loads a compatible native ONNX Runtime.** Packaged sherpa and Java JNI consumers are checked against the shared runtime for every supported ABI before release.
|
||||
- **The visible Android Sphere keeps its smooth procedural motion across startup and chat.** Backgrounded and motion-disabled surfaces remain still without reducing foreground animation to a stepped ambient pulse.
|
||||
|
||||
### Removed
|
||||
|
||||
@@ -26,9 +26,6 @@ model device-certified:
|
||||
renders as Working.
|
||||
- Run a background process that outlives its parent turn and verify Background
|
||||
work remains separate from the conversation's Idle state.
|
||||
- On a physical phone, open and repeatedly foreground Android while the same
|
||||
session is working in official Desktop/TUI; verify Android sends no live
|
||||
attach/interrupt RPC, the producer completes, and final history appears.
|
||||
- Pursue an upstream `session.active_list` profile field/filter or an aggregate
|
||||
activity route with explicit profile ownership so multi-profile clients do
|
||||
not need to resolve process-wide rows from durable keys.
|
||||
|
||||
-83
@@ -239,60 +239,6 @@ class GatewayForegroundRecoveryInstrumentedTest {
|
||||
assertEquals(0, fixture.requestsTo("/v1/chat/completions"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun desktopOwnedTurn_remainsReadOnlyAcrossAndroidForegroundLifecycle() {
|
||||
viewModel.setChatVisible(false)
|
||||
viewModel.updateGatewayClient(null)
|
||||
gatewayClient.shutdown()
|
||||
gatewayScope.cancel()
|
||||
|
||||
val controlMethods = setOf(
|
||||
"session.resume",
|
||||
"session.activate",
|
||||
"session.interrupt",
|
||||
"prompt.submit",
|
||||
)
|
||||
val baseline = controlMethods.associateWith(fixture::rpcCount)
|
||||
val baselineActiveList = fixture.rpcCount("session.active_list")
|
||||
fixture.activeSessionStatus = "working"
|
||||
gatewayScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
|
||||
val okHttp = OkHttpClient()
|
||||
gatewayClient = GatewayChatClient(
|
||||
initialDashboardClient = DashboardApiClient(
|
||||
baseUrl = fixture.server.url("/").toString().trimEnd('/'),
|
||||
okHttpClient = okHttp,
|
||||
),
|
||||
okHttpClient = okHttp,
|
||||
callbackDispatcher = { block -> Handler(Looper.getMainLooper()).post(block) },
|
||||
scope = gatewayScope,
|
||||
reconnectJitterUnit = { 0.0 },
|
||||
)
|
||||
viewModel.setChatTurnCheckpointStore(null)
|
||||
viewModel.updateGatewayClient(gatewayClient)
|
||||
|
||||
viewModel.setChatVisible(true)
|
||||
compose.activityRule.scenario.moveToState(Lifecycle.State.STARTED)
|
||||
compose.activityRule.scenario.moveToState(Lifecycle.State.RESUMED)
|
||||
viewModel.setChatVisible(false)
|
||||
viewModel.setChatVisible(true)
|
||||
fixture.awaitRpcCount("session.active_list", baselineActiveList + 1)
|
||||
|
||||
controlMethods.forEach { method ->
|
||||
assertEquals(
|
||||
"passive lifecycle sent $method",
|
||||
baseline.getValue(method),
|
||||
fixture.rpcCount(method),
|
||||
)
|
||||
}
|
||||
viewModel.updateGatewayClient(null)
|
||||
gatewayClient.shutdown()
|
||||
assertEquals(
|
||||
"observer teardown interrupted the Desktop turn",
|
||||
baseline.getValue("session.interrupt"),
|
||||
fixture.rpcCount("session.interrupt"),
|
||||
)
|
||||
}
|
||||
|
||||
private companion object {
|
||||
const val STORED_SESSION_ID = "20260821_120000_fixture"
|
||||
const val LIVE_SESSION_ID = "fixture-live-1"
|
||||
@@ -317,9 +263,6 @@ internal class AndroidGatewayContractFixture {
|
||||
@Volatile
|
||||
var recoveryRunning = false
|
||||
|
||||
@Volatile
|
||||
var activeSessionStatus: String? = null
|
||||
|
||||
private val listener = object : WebSocketListener() {
|
||||
override fun onOpen(webSocket: WebSocket, response: Response) {
|
||||
sockets.add(webSocket)
|
||||
@@ -339,18 +282,6 @@ internal class AndroidGatewayContractFixture {
|
||||
"session.activate" -> sessionSnapshot(
|
||||
(params["session_id"] as? JsonPrimitive)?.contentOrNull ?: "fixture-live-1",
|
||||
)
|
||||
"session.active_list" -> buildJsonObject {
|
||||
put("sessions", kotlinx.serialization.json.buildJsonArray {
|
||||
activeSessionStatus?.let { status ->
|
||||
add(buildJsonObject {
|
||||
put("id", LIVE_SESSION_ID)
|
||||
put("session_key", STORED_SESSION_ID)
|
||||
put("status", status)
|
||||
put("last_active", 1.0)
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
"prompt.submit", "session.interrupt" -> buildJsonObject { put("ok", true) }
|
||||
else -> JsonObject(emptyMap())
|
||||
}
|
||||
@@ -414,15 +345,6 @@ internal class AndroidGatewayContractFixture {
|
||||
error("Gateway RPC $method not observed; saw ${rpcLog.map { it.first }}")
|
||||
}
|
||||
|
||||
fun awaitRpcCount(method: String, count: Int) {
|
||||
val deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(5)
|
||||
while (System.nanoTime() < deadline) {
|
||||
if (rpcCount(method) >= count) return
|
||||
Thread.sleep(20)
|
||||
}
|
||||
error("Gateway RPC $method count $count not observed; saw ${rpcLog.map { it.first }}")
|
||||
}
|
||||
|
||||
fun requestsTo(path: String): Int = requestPaths.count { it.startsWith(path) }
|
||||
|
||||
fun rpcCount(method: String): Int = rpcLog.count { it.first == method }
|
||||
@@ -431,9 +353,4 @@ internal class AndroidGatewayContractFixture {
|
||||
allSockets.forEach { socket -> runCatching { socket.close(1001, "teardown") } }
|
||||
runCatching { server.shutdown() }
|
||||
}
|
||||
|
||||
private companion object {
|
||||
const val STORED_SESSION_ID = "20260821_120000_fixture"
|
||||
const val LIVE_SESSION_ID = "fixture-live-1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -906,30 +906,6 @@ class GatewayChatClient(
|
||||
scope.launch { prewarmAwait(storedSessionId) }
|
||||
}
|
||||
|
||||
/**
|
||||
* Establish only the shared Gateway socket for read-only observation.
|
||||
*
|
||||
* `session.resume` and `session.activate` attach a live runtime to this
|
||||
* transport. Opening Chat, foreground restoration, and selecting a saved
|
||||
* transcript must not claim a turn that another Desktop/TUI client owns,
|
||||
* so those paths use this socket-only warmup and observe through REST
|
||||
* history plus `session.active_list` instead.
|
||||
*/
|
||||
fun observe(onReady: (() -> Unit)? = null) {
|
||||
scope.launch {
|
||||
if (observeAwait() && onReady != null) callbackDispatcher(onReady)
|
||||
}
|
||||
}
|
||||
|
||||
/** Suspending [observe]; returns true once the read-only socket is ready. */
|
||||
suspend fun observeAwait(): Boolean = try {
|
||||
connectMutex.withLock { ensureConnected() }
|
||||
true
|
||||
} catch (e: Exception) {
|
||||
Log.d(TAG, "Gateway observation warmup skipped: ${e.message}")
|
||||
false
|
||||
}
|
||||
|
||||
/**
|
||||
* Suspending [prewarm]: establishes the socket and (when [storedSessionId]
|
||||
* is non-null) resumes the existing session, returning only once that work
|
||||
|
||||
@@ -1119,16 +1119,12 @@ fun ChatScreen(
|
||||
}
|
||||
|
||||
// Recover any durable in-flight chat checkpoint whenever Chat returns to
|
||||
// the foreground. setChatVisible owns that edge; an ordinary Gateway open
|
||||
// warms only the observation socket and never attaches a saved session.
|
||||
// the foreground. On Gateway this also pre-warms/re-attaches the socket;
|
||||
// sessions-SSE falls back to bounded persisted-history reconciliation.
|
||||
val appForeground by com.hermesandroid.relay.util.AppForegroundTracker.isForeground.collectAsState()
|
||||
LaunchedEffect(isGatewayTransport, appForeground, chatReady) {
|
||||
val chatVisible = appForeground && chatReady
|
||||
val visibilityChanged = chatViewModel.setChatVisible(chatVisible)
|
||||
if (isGatewayTransport && chatVisible && !visibilityChanged) {
|
||||
// Gateway availability can settle after Chat was already visible.
|
||||
// Repeat the socket-only warmup for that edge; ordinary observation
|
||||
// still cannot resume or activate a session.
|
||||
chatViewModel.setChatVisible(appForeground && chatReady)
|
||||
if (appForeground && chatReady) {
|
||||
chatViewModel.prewarmGateway()
|
||||
}
|
||||
if (isGatewayTransport && appForeground && chatReady) {
|
||||
|
||||
@@ -408,9 +408,6 @@ class ChatViewModel : ViewModel() {
|
||||
private val sessionActivityGeneration = AtomicLong(0L)
|
||||
private val sessionActivityPollMutex = Mutex()
|
||||
private var sessionActivityPollJob: Job? = null
|
||||
private var passiveGatewayHistoryRefreshJob: Job? = null
|
||||
private var passivelyObservedGatewaySessionId: String? = null
|
||||
private var passiveObservationCatchupPendingSessionId: String? = null
|
||||
private var sessionActivityDirectory: Set<SessionActivityOwner> = emptySet()
|
||||
private var lastProjectedProcessIds: Set<String> = emptySet()
|
||||
private var lastProjectedProcessOwner: SessionActivityOwner? = null
|
||||
@@ -2255,8 +2252,6 @@ class ChatViewModel : ViewModel() {
|
||||
}
|
||||
|
||||
private suspend fun pollSessionActivity(client: GatewayChatClient) {
|
||||
var hasPassiveCurrentLiveWork = false
|
||||
var hasPassiveCatchupPending = false
|
||||
sessionActivityPollMutex.withLock {
|
||||
if (gatewayClient !== client || !chatVisible || streamingEndpoint != "gateway") return
|
||||
val generation = sessionActivityGeneration.get()
|
||||
@@ -2277,43 +2272,6 @@ class ChatViewModel : ViewModel() {
|
||||
when (val result = client.listActiveSessions()) {
|
||||
is GatewayActiveSessionsResult.Success -> {
|
||||
if (gatewayClient !== client || generation != sessionActivityGeneration.get()) return
|
||||
val currentStoredId = currentOwner?.storedSessionId
|
||||
val passiveCurrentRows = if (currentStoredId == null) {
|
||||
emptyList()
|
||||
} else {
|
||||
result.sessions.filter { row ->
|
||||
row.storedSessionId == currentStoredId &&
|
||||
client.knownSessionOwner(row.runtimeSessionId) == null
|
||||
}
|
||||
}
|
||||
hasPassiveCurrentLiveWork = passiveCurrentRows.any { row ->
|
||||
row.status != GatewayActiveSessionStatus.Idle
|
||||
}
|
||||
val initialCatchupPending =
|
||||
passiveObservationCatchupPendingSessionId == currentStoredId
|
||||
val needsFinalPassiveRefresh =
|
||||
passivelyObservedGatewaySessionId == currentStoredId &&
|
||||
!hasPassiveCurrentLiveWork
|
||||
if (hasPassiveCurrentLiveWork) {
|
||||
currentStoredId?.let(::refreshPassivelyObservedGatewayHistory)
|
||||
if (initialCatchupPending) {
|
||||
passiveObservationCatchupPendingSessionId = null
|
||||
}
|
||||
} else if (needsFinalPassiveRefresh || initialCatchupPending) {
|
||||
val scheduled = currentStoredId?.let { storedId ->
|
||||
refreshPassivelyObservedGatewayHistory(
|
||||
storedSessionId = storedId,
|
||||
retryUntilChanged = true,
|
||||
)
|
||||
} == true
|
||||
if (scheduled && initialCatchupPending) {
|
||||
passiveObservationCatchupPendingSessionId = null
|
||||
}
|
||||
}
|
||||
passivelyObservedGatewaySessionId =
|
||||
currentStoredId?.takeIf { hasPassiveCurrentLiveWork }
|
||||
hasPassiveCatchupPending =
|
||||
passiveObservationCatchupPendingSessionId == currentStoredId
|
||||
val resolved = resolveGatewayActiveSessions(
|
||||
sessions = result.sessions,
|
||||
directory = directory,
|
||||
@@ -2375,18 +2333,6 @@ class ChatViewModel : ViewModel() {
|
||||
GatewayActiveSessionsResult.Unsupported,
|
||||
is GatewayActiveSessionsResult.TransientFailure -> {
|
||||
if (gatewayClient !== client || generation != sessionActivityGeneration.get()) return
|
||||
val currentStoredId = currentOwner?.storedSessionId
|
||||
if (passiveObservationCatchupPendingSessionId == currentStoredId) {
|
||||
val scheduled = currentStoredId?.let { storedId ->
|
||||
refreshPassivelyObservedGatewayHistory(
|
||||
storedSessionId = storedId,
|
||||
retryUntilChanged = true,
|
||||
)
|
||||
} == true
|
||||
if (scheduled) passiveObservationCatchupPendingSessionId = null
|
||||
}
|
||||
hasPassiveCatchupPending =
|
||||
passiveObservationCatchupPendingSessionId == currentStoredId
|
||||
val scopes = directory.mapTo(mutableSetOf()) {
|
||||
SessionActivityScope.of(it.connectionId, it.profile)
|
||||
}.apply { add(currentScope) }
|
||||
@@ -2405,9 +2351,7 @@ class ChatViewModel : ViewModel() {
|
||||
record.freshness == SessionActivityFreshness.Confirmed &&
|
||||
record.phase(System.currentTimeMillis()) != SessionActivityPhase.Idle
|
||||
}
|
||||
val delayMs = if (
|
||||
hasConfirmedLiveWork || hasPassiveCurrentLiveWork || hasPassiveCatchupPending
|
||||
) 1_500L else 30_000L
|
||||
val delayMs = if (hasConfirmedLiveWork) 1_500L else 30_000L
|
||||
sessionActivityPollJob = viewModelScope.launch {
|
||||
delay(delayMs)
|
||||
if (gatewayClient === client && chatVisible) pollSessionActivity(client)
|
||||
@@ -2480,10 +2424,6 @@ class ChatViewModel : ViewModel() {
|
||||
clearProjectedBackgroundProcesses()
|
||||
sessionActivityPollJob?.cancel()
|
||||
sessionActivityPollJob = null
|
||||
passiveGatewayHistoryRefreshJob?.cancel()
|
||||
passiveGatewayHistoryRefreshJob = null
|
||||
passivelyObservedGatewaySessionId = null
|
||||
passiveObservationCatchupPendingSessionId = null
|
||||
sessionActivityGeneration.incrementAndGet()
|
||||
sessionActivityDirectory = emptySet()
|
||||
lastLocalActivityOwner = null
|
||||
@@ -2603,9 +2543,8 @@ class ChatViewModel : ViewModel() {
|
||||
// Foreground can race OkHttp's delayed close callback:
|
||||
// the first prewarm sees the old socket as Ready, then
|
||||
// the callback moves it to Idle. Re-run from this exact
|
||||
// client transition so the observation socket is
|
||||
// restored; only an exact Android checkpoint may
|
||||
// resume/activate a live runtime.
|
||||
// client transition so the visible durable session is
|
||||
// resumed and its authoritative history reconciled.
|
||||
prewarmGateway()
|
||||
}
|
||||
}
|
||||
@@ -3060,103 +2999,6 @@ class ChatViewModel : ViewModel() {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Refresh a Desktop/TUI-owned turn through the profile-scoped history
|
||||
* surface without attaching its live runtime. `session.active_list` drives
|
||||
* the bounded cadence; one final read follows Working/Waiting -> Idle.
|
||||
*/
|
||||
private fun refreshPassivelyObservedGatewayHistory(
|
||||
storedSessionId: String,
|
||||
retryUntilChanged: Boolean = false,
|
||||
): Boolean {
|
||||
if (passiveGatewayHistoryRefreshJob?.isActive == true) return false
|
||||
if (_isLoadingHistory.value) return false
|
||||
val handler = chatHandler ?: return false
|
||||
val contextKey = activeProfileContextKey
|
||||
val profileName = currentSessionProfileName()
|
||||
val refreshJob = viewModelScope.launch(start = CoroutineStart.LAZY) {
|
||||
try {
|
||||
repeat(if (retryUntilChanged) 8 else 1) { attempt ->
|
||||
val serverMessages = runCatching {
|
||||
loadGatewaySessionHistory(
|
||||
sessionId = storedSessionId,
|
||||
requireProfileScope = true,
|
||||
profileName = profileName,
|
||||
)
|
||||
}.getOrNull() ?: return@launch
|
||||
if (
|
||||
chatHandler !== handler ||
|
||||
activeProfileContextKey != contextKey ||
|
||||
currentSessionProfileName() != profileName ||
|
||||
handler.currentSessionId.value != storedSessionId ||
|
||||
_isLoadingHistory.value ||
|
||||
activeStream != null ||
|
||||
handler.isStreaming.value
|
||||
) return@launch
|
||||
|
||||
val visibleSignature = handler.messages.value
|
||||
.filterNot { it.clientOnly }
|
||||
.map { message ->
|
||||
Triple(
|
||||
message.role.name.lowercase(),
|
||||
message.content,
|
||||
message.thinkingContent,
|
||||
)
|
||||
}
|
||||
val serverSignature = serverMessages.map { message ->
|
||||
Triple(
|
||||
message.role.lowercase(),
|
||||
message.contentText.orEmpty(),
|
||||
message.resolvedReasoning.orEmpty(),
|
||||
)
|
||||
}
|
||||
if (visibleSignature != serverSignature) {
|
||||
handler.loadMessageHistory(serverMessages)
|
||||
refreshSessions()
|
||||
scheduleTitleReconcile(storedSessionId)
|
||||
return@launch
|
||||
}
|
||||
if (attempt < 7 && retryUntilChanged) delay(250L)
|
||||
}
|
||||
} finally {
|
||||
if (passiveGatewayHistoryRefreshJob === coroutineContext[Job]) {
|
||||
passiveGatewayHistoryRefreshJob = null
|
||||
}
|
||||
}
|
||||
}
|
||||
passiveGatewayHistoryRefreshJob = refreshJob
|
||||
refreshJob.start()
|
||||
return true
|
||||
}
|
||||
|
||||
/** Open the read-only socket off Main, then publish observation ownership on Main. */
|
||||
private fun observeGatewaySession(
|
||||
client: GatewayChatClient?,
|
||||
handler: ChatHandler,
|
||||
storedSessionId: String,
|
||||
) {
|
||||
val observer = client ?: return
|
||||
val contextKey = activeProfileContextKey
|
||||
val profileName = currentSessionProfileName()
|
||||
observer.observe {
|
||||
if (
|
||||
chatVisible &&
|
||||
gatewayClient === observer &&
|
||||
chatHandler === handler &&
|
||||
activeProfileContextKey == contextKey &&
|
||||
currentSessionProfileName() == profileName &&
|
||||
handler.currentSessionId.value == storedSessionId
|
||||
) {
|
||||
passiveObservationCatchupPendingSessionId = storedSessionId
|
||||
refreshPassivelyObservedGatewayHistory(
|
||||
storedSessionId = storedSessionId,
|
||||
retryUntilChanged = true,
|
||||
)
|
||||
requestSessionActivityRefresh()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** One-shot `config.get personality` over a ready socket → drives the collector. */
|
||||
private fun seedServerPersonality(client: GatewayChatClient) {
|
||||
viewModelScope.launch {
|
||||
@@ -3167,11 +3009,11 @@ class ChatViewModel : ViewModel() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Warm the Gateway socket when Chat is visible without claiming a runtime
|
||||
* that may belong to Desktop/TUI. Exact Android-owned checkpoints recover
|
||||
* through `session.activate`/`session.resume`; an ordinary open observes
|
||||
* through REST history and `session.active_list` until the user performs
|
||||
* an explicit action that needs session ownership.
|
||||
* Warm the gateway socket (and resume the current session) when the chat
|
||||
* surface is visible and the gateway is the resolved transport, so the
|
||||
* first send is warm instead of paying the cold connect + `session.resume`
|
||||
* on the send path. No-op without a gateway client; idempotent when warm.
|
||||
* Driven by a foreground/visibility effect in ChatScreen.
|
||||
*/
|
||||
fun prewarmGateway() {
|
||||
val client = gatewayClient
|
||||
@@ -3179,16 +3021,17 @@ class ChatViewModel : ViewModel() {
|
||||
val sessionId = handler.currentSessionId.value
|
||||
selectBackgroundProcessSession(sessionId)
|
||||
if (sessionId == null) {
|
||||
client?.observe()
|
||||
client?.prewarm(null)
|
||||
} else {
|
||||
// Preserve the original warm-up path before persistence wiring is
|
||||
// available (early composition and JVM tests). Production installs
|
||||
// the store from initializeMedia before Chat becomes ready.
|
||||
if (chatTurnCheckpointStore == null) {
|
||||
val gateway = client ?: return
|
||||
// GatewayChatClient owns the socket IO scope, so the dial can
|
||||
// progress while a paused UI dispatcher is being recreated.
|
||||
observeGatewaySession(gateway, handler, sessionId)
|
||||
// GatewayChatClient owns an IO scope, so this can progress even
|
||||
// while a paused/blocked UI dispatcher is being recreated.
|
||||
// Its cold-ready listener performs history/process refresh.
|
||||
gateway.prewarm(sessionId)
|
||||
return
|
||||
}
|
||||
if (activeStream == null && (streamRecovery == null || client != null)) {
|
||||
@@ -3200,29 +3043,26 @@ class ChatViewModel : ViewModel() {
|
||||
chatHandler === handler &&
|
||||
handler.currentSessionId.value == sessionId
|
||||
) {
|
||||
observeGatewaySession(client, handler, sessionId)
|
||||
if (client?.prewarmAwait(sessionId) == true) {
|
||||
gatewayProcessController.sessionReady(sessionId)
|
||||
}
|
||||
}
|
||||
checkpointRecoveryJob = null
|
||||
}
|
||||
return
|
||||
}
|
||||
// A locally-owned live mapper may revalidate its existing binding.
|
||||
// A passive transcript must remain socket-only: resuming it here
|
||||
// can replace another client's transport and turn Android teardown
|
||||
// into a later session.interrupt.
|
||||
if (client?.hasActiveTurnForSession(sessionId) == true) {
|
||||
viewModelScope.launch {
|
||||
if (client.prewarmAwait(sessionId) &&
|
||||
gatewayClient === client &&
|
||||
chatHandler === handler &&
|
||||
handler.currentSessionId.value == sessionId
|
||||
) {
|
||||
gatewayProcessController.sessionReady(sessionId)
|
||||
requestSessionActivityRefresh()
|
||||
}
|
||||
// prewarm() only emits the existing "cold ready" callback when it
|
||||
// had to resume. An already-live session still needs its initial
|
||||
// process snapshot when Chat opens, so confirm it explicitly.
|
||||
viewModelScope.launch {
|
||||
if (
|
||||
client?.prewarmAwait(sessionId) == true &&
|
||||
gatewayClient === client &&
|
||||
chatHandler === handler &&
|
||||
handler.currentSessionId.value == sessionId
|
||||
) {
|
||||
gatewayProcessController.sessionReady(sessionId)
|
||||
}
|
||||
} else {
|
||||
observeGatewaySession(client, handler, sessionId)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3232,7 +3072,7 @@ class ChatViewModel : ViewModel() {
|
||||
* Gateway chat owns automatic idle-socket reattachment; other tabs and a
|
||||
* backgrounded app retain the normal no-reconnect behavior.
|
||||
*/
|
||||
fun setChatVisible(visible: Boolean): Boolean {
|
||||
fun setChatVisible(visible: Boolean) {
|
||||
val changed = chatVisible != visible
|
||||
chatVisible = visible
|
||||
if (visible && changed) {
|
||||
@@ -3241,12 +3081,7 @@ class ChatViewModel : ViewModel() {
|
||||
} else if (!visible) {
|
||||
sessionActivityPollJob?.cancel()
|
||||
sessionActivityPollJob = null
|
||||
passiveGatewayHistoryRefreshJob?.cancel()
|
||||
passiveGatewayHistoryRefreshJob = null
|
||||
passivelyObservedGatewaySessionId = null
|
||||
passiveObservationCatchupPendingSessionId = null
|
||||
}
|
||||
return changed
|
||||
}
|
||||
|
||||
// === Gateway desktop-parity state ===
|
||||
@@ -4630,9 +4465,7 @@ class ChatViewModel : ViewModel() {
|
||||
)
|
||||
if (stillCurrent()) {
|
||||
handler.loadMessageHistory(messages)
|
||||
if (streamingEndpoint == "gateway") {
|
||||
observeGatewaySession(gatewayClient, handler, sessionId)
|
||||
}
|
||||
if (streamingEndpoint == "gateway") gatewayClient?.prewarm(sessionId)
|
||||
}
|
||||
}
|
||||
} catch (e: kotlinx.coroutines.CancellationException) {
|
||||
@@ -5143,9 +4976,7 @@ class ChatViewModel : ViewModel() {
|
||||
handler.currentSessionId.value == sessionId
|
||||
) {
|
||||
handler.loadMessageHistory(messages)
|
||||
if (streamingEndpoint == "gateway") {
|
||||
observeGatewaySession(gatewayClient, handler, sessionId)
|
||||
}
|
||||
if (streamingEndpoint == "gateway") gatewayClient?.prewarm(sessionId)
|
||||
}
|
||||
} catch (e: kotlinx.coroutines.CancellationException) {
|
||||
throw e
|
||||
@@ -6735,10 +6566,6 @@ class ChatViewModel : ViewModel() {
|
||||
* SSE cannot, so it retains the existing interrupt/cancel behavior.
|
||||
*/
|
||||
private fun releaseTurnForNavigation(handler: ChatHandler) {
|
||||
passiveGatewayHistoryRefreshJob?.cancel()
|
||||
passiveGatewayHistoryRefreshJob = null
|
||||
passivelyObservedGatewaySessionId = null
|
||||
passiveObservationCatchupPendingSessionId = null
|
||||
val gateway = gatewayClient
|
||||
val canBackground = streamingEndpoint == "gateway" &&
|
||||
activeStreamIsGateway && activeStream != null && gateway != null
|
||||
|
||||
+1
-29
@@ -231,14 +231,11 @@ class GatewayClientHarness(
|
||||
val suppressAckMethods: MutableSet<String> = ConcurrentHashMap.newKeySet()
|
||||
val pendingAcks = LinkedBlockingQueue<PendingAck>()
|
||||
|
||||
@Volatile
|
||||
var suppressGatewayReady: Boolean = false
|
||||
|
||||
private val wsListener = object : WebSocketListener() {
|
||||
override fun onOpen(webSocket: WebSocket, response: okhttp3.Response) {
|
||||
serverSockets.add(webSocket)
|
||||
allServerSockets.add(webSocket)
|
||||
if (!suppressGatewayReady) sendGatewayReady(webSocket)
|
||||
webSocket.send(eventFrame("gateway.ready", null, null))
|
||||
}
|
||||
|
||||
override fun onMessage(webSocket: WebSocket, text: String) {
|
||||
@@ -630,10 +627,6 @@ class GatewayClientHarness(
|
||||
fun awaitServerSocket(): WebSocket =
|
||||
serverSockets.poll(5, TimeUnit.SECONDS) ?: error("server socket never opened")
|
||||
|
||||
fun sendGatewayReady(webSocket: WebSocket) {
|
||||
webSocket.send(eventFrame("gateway.ready", null, null))
|
||||
}
|
||||
|
||||
fun awaitRpc(method: String): JsonObject {
|
||||
val deadline = System.currentTimeMillis() + 5_000
|
||||
while (System.currentTimeMillis() < deadline) {
|
||||
@@ -1414,27 +1407,6 @@ class GatewayChatClientTest {
|
||||
assertEquals(listOf("stored-session"), resumedSessions.toList())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `observation warmup never claims or interrupts a foreign runtime`() = runBlocking {
|
||||
val registrations = AtomicInteger(0)
|
||||
client.setUnsolicitedTurnProvider {
|
||||
registrations.incrementAndGet()
|
||||
GatewayInboundTurnRegistration(Recorder().callbacks) { true }
|
||||
}
|
||||
|
||||
assertTrue(client.observeAwait())
|
||||
val serverWs = harness.awaitServerSocket()
|
||||
serverWs.send(harness.eventFrame("message.start", null, "foreign-runtime"))
|
||||
delay(100)
|
||||
client.shutdown()
|
||||
|
||||
assertEquals(0, registrations.get())
|
||||
assertFalse(harness.rpcLog.any { it.first == "session.resume" })
|
||||
assertFalse(harness.rpcLog.any { it.first == "session.activate" })
|
||||
assertFalse(harness.rpcLog.any { it.first == "session.interrupt" })
|
||||
assertFalse(harness.rpcLog.any { it.first == "prompt.submit" })
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `newer prewarm selection wins when an older resume completes late`() = runBlocking {
|
||||
harness.suppressAckMethods += "session.resume"
|
||||
|
||||
+25
-186
@@ -992,12 +992,11 @@ class ChatViewModelGatewayInboundTurnTest {
|
||||
awaitCondition { handler.messages.value.any { it.content == "Partial A" } }
|
||||
|
||||
viewModel.switchSession(secondSession)
|
||||
gatewayHarness.awaitRpcCount("session.resume", 2)
|
||||
awaitCondition { handler.currentSessionId.value == secondSession && !handler.isStreaming.value }
|
||||
assertEquals(1, gatewayHarness.rpcLog.count { it.first == "session.resume" })
|
||||
assertTrue(gatewayHarness.rpcLog.none { it.first == "session.interrupt" })
|
||||
|
||||
viewModel.sendMessage("Run task B")
|
||||
gatewayHarness.awaitRpcCount("session.resume", 2)
|
||||
gatewayHarness.awaitRpcCount("prompt.submit", 2)
|
||||
serverWs.send(
|
||||
gatewayHarness.eventFrame(
|
||||
@@ -1825,12 +1824,11 @@ class ChatViewModelGatewayInboundTurnTest {
|
||||
awaitCondition { viewModel.queuedMessages.value == listOf("Follow up A") }
|
||||
|
||||
viewModel.switchSession(secondSession)
|
||||
gatewayHarness.awaitRpcCount("session.resume", 2)
|
||||
awaitCondition { handler.currentSessionId.value == secondSession && !handler.isStreaming.value }
|
||||
assertEquals(1, gatewayHarness.rpcLog.count { it.first == "session.resume" })
|
||||
assertTrue("session B must not show A's queue", viewModel.queuedMessages.value.isEmpty())
|
||||
|
||||
viewModel.sendMessage("Run task B")
|
||||
gatewayHarness.awaitRpcCount("session.resume", 2)
|
||||
gatewayHarness.awaitRpcCount("prompt.submit", 2)
|
||||
serverWs.send(
|
||||
gatewayHarness.eventFrame(
|
||||
@@ -2033,16 +2031,13 @@ class ChatViewModelGatewayInboundTurnTest {
|
||||
serverWs.close(1012, "test disconnect")
|
||||
awaitCondition { gatewayClient.connectionState.value == GatewayConnectionState.Idle }
|
||||
|
||||
viewModel.setChatVisible(true)
|
||||
viewModel.prewarmGateway()
|
||||
gatewayHarness.awaitServerSocket()
|
||||
gatewayHarness.awaitRpcCount("session.resume", 2)
|
||||
|
||||
awaitCondition {
|
||||
handler.messages.value.singleOrNull()?.content == BACKGROUND_ANSWER
|
||||
}
|
||||
assertEquals(1, gatewayHarness.rpcLog.count { it.first == "session.resume" })
|
||||
assertEquals(0, gatewayHarness.rpcLog.count { it.first == "session.activate" })
|
||||
assertEquals(0, gatewayHarness.rpcLog.count { it.first == "session.interrupt" })
|
||||
assertFalse(handler.isStreaming.value)
|
||||
}
|
||||
|
||||
@@ -2053,19 +2048,16 @@ class ChatViewModelGatewayInboundTurnTest {
|
||||
|
||||
// Foreground arrives while OkHttp still reports the old socket ready,
|
||||
// so the one-shot prewarm is an intentional no-op. The delayed close
|
||||
// callback must itself restore the observation socket and catch up
|
||||
// history without attaching the live session.
|
||||
// callback must itself trigger an exact-session reattach.
|
||||
viewModel.prewarmGateway()
|
||||
serverWs.close(1012, "late background close")
|
||||
|
||||
awaitCondition { gatewayHarness.ticketMints.get() >= 2 }
|
||||
serverWs = gatewayHarness.awaitServerSocket()
|
||||
gatewayHarness.awaitRpcCount("session.resume", 2)
|
||||
awaitCondition {
|
||||
handler.messages.value.singleOrNull()?.content == BACKGROUND_ANSWER
|
||||
}
|
||||
assertEquals(1, gatewayHarness.rpcLog.count { it.first == "session.resume" })
|
||||
assertEquals(0, gatewayHarness.rpcLog.count { it.first == "session.activate" })
|
||||
assertEquals(0, gatewayHarness.rpcLog.count { it.first == "session.interrupt" })
|
||||
assertFalse(handler.isStreaming.value)
|
||||
}
|
||||
|
||||
@@ -2374,189 +2366,36 @@ class ChatViewModelGatewayInboundTurnTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
fun reconnectCatchupClosesCompletionBetweenFirstReadAndIdleSnapshot() {
|
||||
viewModel.switchProfileContext(PROFILE_CONTEXT, STORED_SESSION_ID)
|
||||
awaitCondition { !viewModel.isLoadingHistory.value }
|
||||
val firstReadStarted = CompletableDeferred<Unit>()
|
||||
val releaseFirstRead = CompletableDeferred<Unit>()
|
||||
val readCount = AtomicInteger(0)
|
||||
viewModel.setProfileMessageLoader {
|
||||
if (readCount.incrementAndGet() == 1) {
|
||||
firstReadStarted.complete(Unit)
|
||||
releaseFirstRead.await()
|
||||
Result.success(emptyList())
|
||||
} else {
|
||||
Result.success(persistedHistory)
|
||||
}
|
||||
}
|
||||
fun reconnectAfterMissedStartRecoversOnExactSessionCompletion() {
|
||||
serverWs.close(1012, "missed start")
|
||||
awaitCondition { gatewayClient.connectionState.value == GatewayConnectionState.Idle }
|
||||
viewModel.setChatVisible(true)
|
||||
viewModel.prewarmGateway()
|
||||
serverWs = gatewayHarness.awaitServerSocket()
|
||||
awaitCondition { firstReadStarted.isCompleted }
|
||||
// Completion persists after the reconnect's first catch-up read began,
|
||||
// while the first active-list snapshot is already empty/idle. The
|
||||
// pending final-read marker must close this exact ordering window.
|
||||
gatewayHarness.awaitRpcCount("session.resume", 2)
|
||||
|
||||
// Reconnected midway through the synthetic turn: no message.start is
|
||||
// replayed, so the delta is intentionally ignored and completion drives
|
||||
// authoritative history recovery.
|
||||
serverWs.send(
|
||||
gatewayHarness.eventFrame(
|
||||
"message.delta",
|
||||
buildJsonObject { put("text", BACKGROUND_ANSWER) },
|
||||
"live-resumed",
|
||||
),
|
||||
)
|
||||
persistedHistory = persistedAnswerHistory()
|
||||
releaseFirstRead.complete(Unit)
|
||||
serverWs.send(
|
||||
gatewayHarness.eventFrame(
|
||||
"message.complete",
|
||||
buildJsonObject { put("text", BACKGROUND_ANSWER) },
|
||||
"live-resumed",
|
||||
),
|
||||
)
|
||||
|
||||
awaitCondition { handler.messages.value.any { it.content == BACKGROUND_ANSWER } }
|
||||
assertEquals(1, gatewayHarness.rpcLog.count { it.first == "session.resume" })
|
||||
assertEquals(0, gatewayHarness.rpcLog.count { it.first == "session.activate" })
|
||||
assertEquals(0, gatewayHarness.rpcLog.count { it.first == "session.interrupt" })
|
||||
assertFalse(handler.isStreaming.value)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun passiveForegroundObservationNeverClaimsOrInterruptsDesktopTurn() {
|
||||
val observerProfile = Profile(
|
||||
name = "observer",
|
||||
model = "model-a",
|
||||
description = "Observer",
|
||||
)
|
||||
viewModel.setSelectedProfileProvider { observerProfile }
|
||||
viewModel.setSessionProfileNameProvider { observerProfile.name }
|
||||
viewModel.setProfileMessageLoaderWithMode { profileName, sessionId, _ ->
|
||||
assertEquals(STORED_SESSION_ID, sessionId)
|
||||
Result.success(
|
||||
if (profileName == observerProfile.name) {
|
||||
persistedHistory
|
||||
} else {
|
||||
listOf(
|
||||
MessageItem(
|
||||
id = "wrong-profile",
|
||||
sessionId = STORED_SESSION_ID,
|
||||
role = "assistant",
|
||||
content = JsonPrimitive("Wrong profile history"),
|
||||
),
|
||||
)
|
||||
},
|
||||
)
|
||||
}
|
||||
viewModel.switchProfileContext(
|
||||
AgentDisplay.profileContextKey("connection-a", observerProfile.name),
|
||||
STORED_SESSION_ID,
|
||||
)
|
||||
awaitCondition { !viewModel.isLoadingHistory.value }
|
||||
viewModel.setChatVisible(false)
|
||||
viewModel.updateGatewayClient(null)
|
||||
gatewayClient.shutdown()
|
||||
gatewayScope.cancel()
|
||||
|
||||
val ownershipMethods = setOf(
|
||||
"session.resume",
|
||||
"session.activate",
|
||||
"session.interrupt",
|
||||
"prompt.submit",
|
||||
)
|
||||
val baseline = ownershipMethods.associateWith { method ->
|
||||
gatewayHarness.rpcLog.count { it.first == method }
|
||||
}
|
||||
val baselineActiveList = gatewayHarness.rpcLog.count { it.first == "session.active_list" }
|
||||
gatewayHarness.activeSessionListPayload = activeSessionPayload("working")
|
||||
gatewayScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
|
||||
gatewayClient = GatewayChatClient(
|
||||
initialDashboardClient = DashboardApiClient(
|
||||
baseUrl = gatewayHarness.server.url("/").toString().trimEnd('/'),
|
||||
okHttpClient = OkHttpClient(),
|
||||
),
|
||||
okHttpClient = OkHttpClient(),
|
||||
callbackDispatcher = { block -> Handler(Looper.getMainLooper()).post(block) },
|
||||
scope = gatewayScope,
|
||||
)
|
||||
viewModel.setChatTurnCheckpointStore(MemoryCheckpointStore())
|
||||
viewModel.updateGatewayClient(gatewayClient)
|
||||
|
||||
viewModel.setChatVisible(true)
|
||||
viewModel.prewarmGateway()
|
||||
awaitCondition {
|
||||
gatewayHarness.rpcLog.count { it.first == "session.active_list" } > baselineActiveList
|
||||
}
|
||||
persistedHistory = listOf(
|
||||
MessageItem(
|
||||
id = "desktop-answer",
|
||||
sessionId = STORED_SESSION_ID,
|
||||
role = "assistant",
|
||||
content = JsonPrimitive("Desktop completed without Android attachment."),
|
||||
),
|
||||
)
|
||||
awaitCondition {
|
||||
handler.messages.value.singleOrNull()?.content ==
|
||||
"Desktop completed without Android attachment."
|
||||
}
|
||||
ownershipMethods.forEach { method ->
|
||||
assertEquals(
|
||||
"passive foreground sent $method",
|
||||
baseline.getValue(method),
|
||||
gatewayHarness.rpcLog.count { it.first == method },
|
||||
)
|
||||
}
|
||||
|
||||
viewModel.updateGatewayClient(null)
|
||||
gatewayClient.shutdown()
|
||||
assertEquals(
|
||||
"observer teardown interrupted the Desktop turn",
|
||||
baseline.getValue("session.interrupt"),
|
||||
gatewayHarness.rpcLog.count { it.first == "session.interrupt" },
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun observerReadyAfterChatHidesCannotRestartPassiveWork() {
|
||||
viewModel.switchProfileContext(PROFILE_CONTEXT, STORED_SESSION_ID)
|
||||
awaitCondition { !viewModel.isLoadingHistory.value }
|
||||
viewModel.setChatVisible(false)
|
||||
viewModel.updateGatewayClient(null)
|
||||
gatewayClient.shutdown()
|
||||
gatewayScope.cancel()
|
||||
|
||||
val historyReads = AtomicInteger(0)
|
||||
viewModel.setProfileMessageLoader {
|
||||
historyReads.incrementAndGet()
|
||||
Result.success(persistedHistory)
|
||||
}
|
||||
val controlMethods = setOf(
|
||||
"session.resume",
|
||||
"session.activate",
|
||||
"session.interrupt",
|
||||
"prompt.submit",
|
||||
)
|
||||
val baseline = controlMethods.associateWith { method ->
|
||||
gatewayHarness.rpcLog.count { it.first == method }
|
||||
}
|
||||
val baselineActiveList = gatewayHarness.rpcLog.count { it.first == "session.active_list" }
|
||||
gatewayHarness.suppressGatewayReady = true
|
||||
gatewayScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
|
||||
gatewayClient = GatewayChatClient(
|
||||
initialDashboardClient = DashboardApiClient(
|
||||
baseUrl = gatewayHarness.server.url("/").toString().trimEnd('/'),
|
||||
okHttpClient = OkHttpClient(),
|
||||
),
|
||||
okHttpClient = OkHttpClient(),
|
||||
callbackDispatcher = { block -> Handler(Looper.getMainLooper()).post(block) },
|
||||
scope = gatewayScope,
|
||||
)
|
||||
viewModel.setChatTurnCheckpointStore(MemoryCheckpointStore())
|
||||
viewModel.updateGatewayClient(gatewayClient)
|
||||
|
||||
viewModel.setChatVisible(true)
|
||||
val delayedSocket = gatewayHarness.awaitServerSocket()
|
||||
viewModel.setChatVisible(false)
|
||||
gatewayHarness.sendGatewayReady(delayedSocket)
|
||||
shadowOf(Looper.getMainLooper()).idleFor(500, TimeUnit.MILLISECONDS)
|
||||
Thread.sleep(100)
|
||||
|
||||
assertEquals(0, historyReads.get())
|
||||
assertEquals(
|
||||
baselineActiveList,
|
||||
gatewayHarness.rpcLog.count { it.first == "session.active_list" },
|
||||
)
|
||||
controlMethods.forEach { method ->
|
||||
assertEquals(baseline.getValue(method), gatewayHarness.rpcLog.count { it.first == method })
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun staleHistoryReadCannotEraseATurnCompletedDuringTheFetch() {
|
||||
val loadCount = AtomicInteger(0)
|
||||
|
||||
@@ -3977,36 +3977,3 @@ disappearance, client-side profile isolation, and method-not-found; physical
|
||||
and current-host certification remains tracked in `TODO.md`. An upstream
|
||||
profile field/filter or explicitly owned aggregate activity route would remove
|
||||
the remaining ambiguity for multi-profile clients.
|
||||
|
||||
---
|
||||
|
||||
## ADR 69 — Passive Android observation never attaches another client's Gateway turn
|
||||
|
||||
**Status:** Accepted (2026-08-28).
|
||||
|
||||
**Context.** `session.resume` and `session.activate` are live-runtime attachment
|
||||
operations, not read-only subscriptions. Android previously called
|
||||
`session.resume` while opening or foregrounding Chat and after loading a saved
|
||||
session's history. When Desktop/TUI already owned a running turn, that passive
|
||||
prewarm could rebind the runtime transport to Android. A later Android socket,
|
||||
route, or client teardown could then strand the producer or promote the foreign
|
||||
turn into an Android `GatewayTurn` whose cancellation sends `session.interrupt`.
|
||||
The issue was distinct from the earlier stale-view and missing-terminal recovery
|
||||
paths, which concern exact Android-owned checkpoints.
|
||||
|
||||
**Decision.** Ordinary visibility, foreground restoration, Idle-socket recovery,
|
||||
and saved-session selection establish only the shared Gateway socket. They use
|
||||
profile-scoped REST history plus process-wide `session.active_list`; while an
|
||||
unowned row with the selected durable id is live, Android performs bounded
|
||||
history refreshes and one final read after settlement. These observer paths send
|
||||
no `session.resume`, `session.activate`, `prompt.submit`, or `session.interrupt`.
|
||||
Exact Android-owned checkpoints retain `session.activate` with durable-resume
|
||||
fallback, and explicit send or session-config actions may resume because the user
|
||||
is intentionally taking control of that destination.
|
||||
|
||||
**Consequences.** Opening Android cannot replace, stop, or later cancel a turn
|
||||
already running in Desktop/TUI. Live token frames remain with the producing
|
||||
client; Android observes durable progress and final history without inventing a
|
||||
multi-subscriber Gateway contract. The first explicit Android mutation may pay
|
||||
the resume latency that passive prewarm previously hid. Cross-client fixtures
|
||||
and Android lifecycle coverage enforce the no-control-RPC observation boundary.
|
||||
|
||||
@@ -41,7 +41,6 @@ the upstream contract identifiers it depends on.
|
||||
| `active_status_lifecycle` | `session.active_list` reports starting, working, waiting, and idle, then a complete empty process-wide snapshot permits removal of unambiguously owned prior rows |
|
||||
| `active_status_profile_scope` | A row has no profile metadata and a caller profile hint has no effect; the client must use exact client-held ownership and reject invented attribution |
|
||||
| `active_status_unsupported` | An older Gateway returns JSON-RPC method-not-found; the client retains Unknown rather than inventing Idle or Working |
|
||||
| `cross_client_observation` | A second client observes a Desktop-owned working session through active status and history without resume, activate, submit, or interrupt; the producing client receives the terminal event |
|
||||
|
||||
Fixture evidence is a bounded metadata-only ring. It records sequence,
|
||||
connection number, RPC method, event type, scope classification, and outcome.
|
||||
|
||||
+1
-1
@@ -481,7 +481,7 @@ Bottom navigation bar with 4 tabs:
|
||||
- **Bot group projection** — Android merges the bounded `ui_meta["hermes-bots-groups"]` v3 projection across gateways by durable room identity and newest revision. Rooms and recent messages are visibly read-only; Android does not create, rename, disband, join, send, coordinate member turns, or become a second room-log authority. Binary room images are ignored at this metadata boundary.
|
||||
- **Session drawer** (swipe from left or hamburger icon) — session list with title, timestamp, message count. Create, switch, rename, delete, pin/unpin, and archive/restore. The process-owned conversation binding is the single connection/profile/session identity for Chat; selecting an All Profiles row atomically makes its owner the selected agent and persists that profile/session, while merely browsing All Profiles changes no agent state. Lifecycle or locale-driven Activity recreation cannot replace an explicit binding with stale persisted state, and asynchronous list/history/mutation work is accepted only for the binding's exact namespace. A profile lock hides All Profiles and rejects stale/deep-linked cross-profile opens. The All Profiles browser mode otherwise survives Activity state restoration and refetches its rows after recreation. Pin and archive are durable upstream session fields loaded and patched through the owning connection/profile's Dashboard session API; Android does not keep a second local flag registry. Archived rows are requested explicitly so they remain restorable after recreation. Failed mutations roll back the optimistic row, while refresh and deletion reconcile from server truth. When a persisted title is absent, use upstream's first-user-message `preview`, matching the Hermes Desktop session picker; show "Untitled" only when neither value exists.
|
||||
- **Authoritative session activity** — one composite registry keyed by connection, normalized profile, and durable session id drives the drawer, filters, grouping, animation, accessibility, and the visible composer. Exact pending approval/clarify/sudo/secret/MCP requests produce **Needs input**; the Gateway's process-wide `session.active_list` supplies **Starting**, **Working**, and **Idle**; exact terminal or `session.info {running:false}` can settle the matching generation. Because active-list rows normally have no profile metadata, Android assigns a row only through exact foreground/detached ownership already held by that client, or explicit profile metadata if a future upstream sends it. A bounded REST directory never proves global uniqueness. Unresolved rows create no status. Resolved rows from a partial snapshot may update their exact owners, but disappearance settles a scope only when the successful process-wide snapshot was completely and unambiguously resolved for it. Restart/checkpoint recovery is **Checking**; a failed or unsupported live refresh is **Unavailable**, never inferred Idle. REST `is_active` remains recency metadata only. `process.list` may add a separate **Background work** indicator and never keeps the parent conversation Working. Old socket generations, bare session ids from another profile, and delayed snapshots cannot revive newer settled state.
|
||||
- **Concurrent Gateway chats** — switching sessions, profiles, drafts, or Threads detaches the visible Android-owned turn without sending `session.interrupt`; each Android-owned running chat keeps a connection/profile/session-scoped checkpoint and reattaches to its live Gateway session when reopened. Opening, foregrounding, or selecting a saved session without that exact checkpoint is read-only observation: Android warms only the socket, reads profile-scoped history, and polls `session.active_list` without `session.resume`, `session.activate`, `prompt.submit`, or `session.interrupt`. A Desktop/TUI-owned turn therefore remains owned by its producing client; Android refreshes persisted progress and performs one final history read when the runtime settles. Explicit send/config actions may resume the destination session, explicit Stop still interrupts, and SSE fallback stays single-stream and cancels on navigation.
|
||||
- **Concurrent Gateway chats** — switching sessions, profiles, drafts, or Threads detaches the visible turn without sending `session.interrupt`; each running chat keeps a connection/profile/session-scoped checkpoint and reattaches to its live Gateway session when reopened. Explicit Stop still interrupts. SSE fallback stays single-stream and cancels on navigation.
|
||||
- **Queued Gateway follow-ups** — every local queued item is immutably scoped to its originating connection, profile, stored session, transport, and run generation; only that run's completion can make it eligible, and switching sessions shows only that session's queue. Restored text queues retain the same scope, while unavailable/deleted destinations and non-restorable attachment queues fail visibly instead of following the current composer. Drained messages add `queued: true` to `prompt.submit`; ordinary sends omit the field. Authoritative submit rejections (`4004`, `4018`, `4028`, `4029`, `4030`, `4090`, `5008`, `5070`, and `5071`) preserve the server message and never fall through to API-server SSE.
|
||||
- **Durable composer drafts** — each connection/profile/session owns one app-private draft containing text, quote/edit context, and pending attachment bytes. Metadata and content-addressed blobs live under Android's no-backup directory, are capped at 64 drafts and 128 MB of retained blobs outside the active draft, flush when Chat backgrounds, and are removed after a successful send. Session/profile/connection navigation saves the previous owner before restoring the destination; an opened cross-profile session uses its actual owning profile rather than the global picker.
|
||||
- **Large paste review** — a default-on Chat setting converts any single insertion of at least 5,000 characters into a visible `pasted-text.txt` attachment before the normal message-length limit rejects it. Gateway uses upstream `file.attach`; API-server SSE and proactive Thread paths materialize the same UTF-8 text into the outgoing prompt and remove only the synthetic attachment from that transport, so the behavior never requires Relay or silently drops content.
|
||||
|
||||
@@ -31,7 +31,7 @@ play-publisher = "4.1.1"
|
||||
media3 = "1.11.0"
|
||||
androidVad = "2.0.10"
|
||||
sherpaOnnx = "v1.13.4"
|
||||
onnxRuntime = "1.29.0"
|
||||
onnxRuntime = "1.27.0"
|
||||
spatialsdk = "0.13.2"
|
||||
play-app-update = "2.1.0"
|
||||
|
||||
|
||||
@@ -0,0 +1,306 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Verify that packaged Android JNI consumers match their shared ONNX Runtime.
|
||||
|
||||
The APK is the authority for this check. Gradle can resolve multiple AARs that
|
||||
contain the same native filename, and ``pickFirst`` alone does not prove that
|
||||
the selected runtime exports the symbol version required by sherpa's JNI.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
from collections import defaultdict
|
||||
from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
import re
|
||||
import struct
|
||||
import sys
|
||||
import zipfile
|
||||
|
||||
|
||||
ORT_ENTRY_POINT = "OrtGetApiBase"
|
||||
RUNTIME_LIBRARY = "libonnxruntime.so"
|
||||
REQUIRED_CONSUMER = "libsherpa-onnx-jni.so"
|
||||
ORT_JAVA_CONSUMER = "libonnxruntime4j_jni.so"
|
||||
SUPPORTED_ABIS = {"arm64-v8a", "armeabi-v7a", "x86", "x86_64"}
|
||||
LIBRARY_PATH = re.compile(
|
||||
r"^(?:base/)?lib/(?P<abi>[^/]+)/(?P<library>[^/]+\.so)$"
|
||||
)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class Section:
|
||||
section_type: int
|
||||
offset: int
|
||||
size: int
|
||||
link: int
|
||||
entry_size: int
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class VersionedSymbol:
|
||||
defined: bool
|
||||
version: str | None
|
||||
|
||||
|
||||
def _unpack(fmt: str, data: bytes, offset: int) -> tuple[int, ...]:
|
||||
size = struct.calcsize(fmt)
|
||||
if offset < 0 or offset + size > len(data):
|
||||
raise ValueError("ELF structure extends beyond the file")
|
||||
return struct.unpack_from(fmt, data, offset)
|
||||
|
||||
|
||||
def _cstring(data: bytes, offset: int) -> str:
|
||||
if offset < 0 or offset >= len(data):
|
||||
raise ValueError("ELF string offset is outside its string table")
|
||||
end = data.find(b"\0", offset)
|
||||
if end < 0:
|
||||
raise ValueError("ELF string is not NUL-terminated")
|
||||
return data[offset:end].decode("utf-8", errors="replace")
|
||||
|
||||
|
||||
def _elf_layout(data: bytes) -> tuple[str, bool, list[Section]]:
|
||||
if len(data) < 16 or data[:4] != b"\x7fELF":
|
||||
raise ValueError("not an ELF file")
|
||||
elf_class = data[4]
|
||||
byte_order = data[5]
|
||||
if elf_class not in (1, 2) or byte_order not in (1, 2):
|
||||
raise ValueError("unsupported ELF class or byte order")
|
||||
endian = "<" if byte_order == 1 else ">"
|
||||
is_64_bit = elf_class == 2
|
||||
|
||||
if is_64_bit:
|
||||
header = _unpack(endian + "HHIQQQIHHHHHH", data, 16)
|
||||
section_offset, section_entry_size, section_count = header[5], header[10], header[11]
|
||||
section_format = endian + "IIQQQQIIQQ"
|
||||
else:
|
||||
header = _unpack(endian + "HHIIIIIHHHHHH", data, 16)
|
||||
section_offset, section_entry_size, section_count = header[5], header[10], header[11]
|
||||
section_format = endian + "IIIIIIIIII"
|
||||
|
||||
minimum_entry_size = struct.calcsize(section_format)
|
||||
if section_entry_size < minimum_entry_size:
|
||||
raise ValueError("ELF section-header entry is too small")
|
||||
|
||||
sections: list[Section] = []
|
||||
for index in range(section_count):
|
||||
fields = _unpack(section_format, data, section_offset + index * section_entry_size)
|
||||
sections.append(
|
||||
Section(
|
||||
section_type=fields[1],
|
||||
offset=fields[4],
|
||||
size=fields[5],
|
||||
link=fields[6],
|
||||
entry_size=fields[9],
|
||||
)
|
||||
)
|
||||
return endian, is_64_bit, sections
|
||||
|
||||
|
||||
def _section_data(data: bytes, section: Section) -> bytes:
|
||||
end = section.offset + section.size
|
||||
if section.offset < 0 or end > len(data):
|
||||
raise ValueError("ELF section extends beyond the file")
|
||||
return data[section.offset:end]
|
||||
|
||||
|
||||
def _version_names(
|
||||
data: bytes,
|
||||
endian: str,
|
||||
sections: list[Section],
|
||||
) -> dict[int, str]:
|
||||
names: dict[int, str] = {}
|
||||
for section in sections:
|
||||
if section.section_type not in (0x6FFFFFFD, 0x6FFFFFFE):
|
||||
continue
|
||||
if section.link >= len(sections):
|
||||
raise ValueError("ELF version section has an invalid string-table link")
|
||||
strings = _section_data(data, sections[section.link])
|
||||
cursor = 0
|
||||
while cursor < section.size:
|
||||
base = section.offset + cursor
|
||||
if section.section_type == 0x6FFFFFFD: # SHT_GNU_verdef
|
||||
fields = _unpack(endian + "HHHHIII", data, base)
|
||||
version_index, aux_offset, next_offset = fields[2], fields[5], fields[6]
|
||||
name_offset, _ = _unpack(endian + "II", data, base + aux_offset)
|
||||
names[version_index] = _cstring(strings, name_offset)
|
||||
else: # SHT_GNU_verneed
|
||||
fields = _unpack(endian + "HHIII", data, base)
|
||||
count, aux_offset, next_offset = fields[1], fields[3], fields[4]
|
||||
aux_cursor = base + aux_offset
|
||||
for _ in range(count):
|
||||
aux = _unpack(endian + "IHHII", data, aux_cursor)
|
||||
names[aux[2] & 0x7FFF] = _cstring(strings, aux[3])
|
||||
if aux[4] == 0:
|
||||
break
|
||||
aux_cursor += aux[4]
|
||||
if next_offset == 0:
|
||||
break
|
||||
cursor += next_offset
|
||||
return names
|
||||
|
||||
|
||||
def read_versioned_symbols(data: bytes) -> dict[str, list[VersionedSymbol]]:
|
||||
endian, is_64_bit, sections = _elf_layout(data)
|
||||
version_names = _version_names(data, endian, sections)
|
||||
symbols: dict[str, list[VersionedSymbol]] = defaultdict(list)
|
||||
|
||||
for dynsym_index, dynsym in enumerate(sections):
|
||||
if dynsym.section_type != 11: # SHT_DYNSYM
|
||||
continue
|
||||
if dynsym.link >= len(sections):
|
||||
raise ValueError("ELF dynamic-symbol table has an invalid string-table link")
|
||||
strings = _section_data(data, sections[dynsym.link])
|
||||
symbol_format = endian + ("IBBHQQ" if is_64_bit else "IIIBBH")
|
||||
symbol_size = dynsym.entry_size or struct.calcsize(symbol_format)
|
||||
symbol_count = dynsym.size // symbol_size
|
||||
|
||||
versions: tuple[int, ...] = ()
|
||||
for section in sections:
|
||||
if section.section_type == 0x6FFFFFFF and section.link == dynsym_index:
|
||||
raw_versions = _section_data(data, section)
|
||||
versions = struct.unpack(endian + f"{len(raw_versions) // 2}H", raw_versions)
|
||||
break
|
||||
|
||||
for index in range(symbol_count):
|
||||
fields = _unpack(symbol_format, data, dynsym.offset + index * symbol_size)
|
||||
name_offset = fields[0]
|
||||
section_index = fields[3] if is_64_bit else fields[5]
|
||||
name = _cstring(strings, name_offset)
|
||||
if not name:
|
||||
continue
|
||||
version_index = (versions[index] & 0x7FFF) if index < len(versions) else 0
|
||||
symbols[name].append(
|
||||
VersionedSymbol(
|
||||
defined=section_index != 0,
|
||||
version=version_names.get(version_index),
|
||||
)
|
||||
)
|
||||
return symbols
|
||||
|
||||
|
||||
def _single_symbol_version(
|
||||
blob: bytes,
|
||||
*,
|
||||
defined: bool,
|
||||
context: str,
|
||||
) -> str:
|
||||
matches = [
|
||||
symbol.version
|
||||
for symbol in read_versioned_symbols(blob).get(ORT_ENTRY_POINT, [])
|
||||
if symbol.defined == defined
|
||||
]
|
||||
if not matches:
|
||||
role = "export" if defined else "requirement"
|
||||
raise ValueError(f"{context} has no {ORT_ENTRY_POINT} {role}")
|
||||
versions = set(matches)
|
||||
if None in versions:
|
||||
raise ValueError(f"{context} uses an unversioned {ORT_ENTRY_POINT} symbol")
|
||||
if len(versions) != 1:
|
||||
raise ValueError(f"{context} has ambiguous {ORT_ENTRY_POINT} versions: {sorted(versions)}")
|
||||
return next(iter(versions)) # type: ignore[return-value]
|
||||
|
||||
|
||||
def check_artifact(path: Path, expected_abis: set[str] | None = None) -> list[str]:
|
||||
failures: list[str] = []
|
||||
with zipfile.ZipFile(path) as archive:
|
||||
libraries: dict[str, dict[str, list[zipfile.ZipInfo]]] = defaultdict(
|
||||
lambda: defaultdict(list)
|
||||
)
|
||||
for info in archive.infolist():
|
||||
match = LIBRARY_PATH.fullmatch(info.filename)
|
||||
if match:
|
||||
libraries[match.group("abi")][match.group("library")].append(info)
|
||||
|
||||
if not libraries:
|
||||
return [f"{path}: no packaged native libraries found"]
|
||||
|
||||
expected = SUPPORTED_ABIS if expected_abis is None else expected_abis
|
||||
actual = set(libraries)
|
||||
if actual != expected:
|
||||
failures.append(
|
||||
f"{path.name}: packaged ABI set is {sorted(actual)}, expected {sorted(expected)}"
|
||||
)
|
||||
|
||||
for abi, by_name in sorted(libraries.items()):
|
||||
for required in (RUNTIME_LIBRARY, REQUIRED_CONSUMER, ORT_JAVA_CONSUMER):
|
||||
count = len(by_name.get(required, []))
|
||||
if count != 1:
|
||||
failures.append(
|
||||
f"{path.name} [{abi}]: expected exactly one {required}, found {count}"
|
||||
)
|
||||
if failures and (
|
||||
len(by_name.get(RUNTIME_LIBRARY, [])) != 1
|
||||
or len(by_name.get(REQUIRED_CONSUMER, [])) != 1
|
||||
or len(by_name.get(ORT_JAVA_CONSUMER, [])) != 1
|
||||
):
|
||||
continue
|
||||
|
||||
try:
|
||||
runtime_version = _single_symbol_version(
|
||||
archive.read(by_name[RUNTIME_LIBRARY][0]),
|
||||
defined=True,
|
||||
context=f"{path.name} [{abi}] {RUNTIME_LIBRARY}",
|
||||
)
|
||||
for consumer in (REQUIRED_CONSUMER, ORT_JAVA_CONSUMER):
|
||||
consumer_version = _single_symbol_version(
|
||||
archive.read(by_name[consumer][0]),
|
||||
defined=False,
|
||||
context=f"{path.name} [{abi}] {consumer}",
|
||||
)
|
||||
if runtime_version != consumer_version:
|
||||
failures.append(
|
||||
f"{path.name} [{abi}]: {consumer} requires "
|
||||
f"{ORT_ENTRY_POINT}@{consumer_version}, but {RUNTIME_LIBRARY} exports "
|
||||
f"{ORT_ENTRY_POINT}@{runtime_version}"
|
||||
)
|
||||
except ValueError as error:
|
||||
failures.append(str(error))
|
||||
return failures
|
||||
|
||||
|
||||
def main() -> int:
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument(
|
||||
"artifact",
|
||||
nargs="+",
|
||||
type=Path,
|
||||
help="APK or AAB artifact to inspect.",
|
||||
)
|
||||
parser.add_argument(
|
||||
"--expected-abi",
|
||||
action="append",
|
||||
default=[],
|
||||
help=(
|
||||
"Expected packaged ABI; repeat to override the standard four-ABI set "
|
||||
"for a deliberate -Phermes.devAbi build."
|
||||
),
|
||||
)
|
||||
args = parser.parse_args()
|
||||
|
||||
failures: list[str] = []
|
||||
for artifact in args.artifact:
|
||||
if not artifact.is_file():
|
||||
failures.append(f"artifact does not exist: {artifact}")
|
||||
continue
|
||||
try:
|
||||
expected_abis = set(args.expected_abi) or SUPPORTED_ABIS
|
||||
failures.extend(check_artifact(artifact, expected_abis))
|
||||
except (OSError, ValueError, zipfile.BadZipFile) as error:
|
||||
failures.append(f"{artifact}: {error}")
|
||||
|
||||
if failures:
|
||||
print("Android native compatibility check failed:", file=sys.stderr)
|
||||
for failure in failures:
|
||||
print(f" {failure}", file=sys.stderr)
|
||||
return 1
|
||||
|
||||
print(
|
||||
"Android native compatibility check passed "
|
||||
f"({len(args.artifact)} artifact(s), {ORT_ENTRY_POINT} symbol versions aligned)"
|
||||
)
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
@@ -0,0 +1,164 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import importlib.util
|
||||
from pathlib import Path
|
||||
import struct
|
||||
import sys
|
||||
import tempfile
|
||||
import unittest
|
||||
import zipfile
|
||||
|
||||
|
||||
SCRIPT = Path(__file__).resolve().parents[1] / "check-android-native-compat.py"
|
||||
SPEC = importlib.util.spec_from_file_location("check_android_native_compat", SCRIPT)
|
||||
assert SPEC is not None and SPEC.loader is not None
|
||||
native_compat = importlib.util.module_from_spec(SPEC)
|
||||
sys.modules[SPEC.name] = native_compat
|
||||
SPEC.loader.exec_module(native_compat)
|
||||
|
||||
|
||||
def elf_with_ort_symbol(*, defined: bool, version: str) -> bytes:
|
||||
"""Build a minimal ELF64 containing a versioned OrtGetApiBase dynsym."""
|
||||
symbol_name = b"OrtGetApiBase"
|
||||
version_name = version.encode("ascii")
|
||||
dependency_name = b"libonnxruntime.so"
|
||||
strings = b"\0" + symbol_name + b"\0" + version_name + b"\0" + dependency_name + b"\0"
|
||||
symbol_offset = 1
|
||||
version_offset = symbol_offset + len(symbol_name) + 1
|
||||
dependency_offset = version_offset + len(version_name) + 1
|
||||
|
||||
dynsym = b"\0" * 24 + struct.pack(
|
||||
"<IBBHQQ",
|
||||
symbol_offset,
|
||||
0x12,
|
||||
0,
|
||||
1 if defined else 0,
|
||||
0,
|
||||
0,
|
||||
)
|
||||
versym = struct.pack("<HH", 0, 2)
|
||||
if defined:
|
||||
version_section_type = 0x6FFFFFFD
|
||||
version_data = struct.pack("<HHHHIII", 1, 0, 2, 1, 0, 20, 0)
|
||||
version_data += struct.pack("<II", version_offset, 0)
|
||||
else:
|
||||
version_section_type = 0x6FFFFFFE
|
||||
version_data = struct.pack("<HHIII", 1, 1, dependency_offset, 16, 0)
|
||||
version_data += struct.pack("<IHHII", 0, 0, 2, version_offset, 0)
|
||||
|
||||
section_blobs = [b"", strings, dynsym, versym, version_data]
|
||||
offsets: list[int] = []
|
||||
image = bytearray(b"\0" * 64)
|
||||
for blob in section_blobs:
|
||||
while len(image) % 8:
|
||||
image.append(0)
|
||||
offsets.append(len(image))
|
||||
image.extend(blob)
|
||||
|
||||
while len(image) % 8:
|
||||
image.append(0)
|
||||
section_header_offset = len(image)
|
||||
section_headers = [
|
||||
(0, 0, 0, 0, offsets[0], 0, 0, 0, 0, 0),
|
||||
(0, 3, 0, 0, offsets[1], len(strings), 0, 0, 1, 0),
|
||||
(0, 11, 0, 0, offsets[2], len(dynsym), 1, 0, 8, 24),
|
||||
(0, 0x6FFFFFFF, 0, 0, offsets[3], len(versym), 2, 0, 2, 2),
|
||||
(0, version_section_type, 0, 0, offsets[4], len(version_data), 1, 0, 4, 0),
|
||||
]
|
||||
for header in section_headers:
|
||||
image.extend(struct.pack("<IIQQQQIIQQ", *header))
|
||||
|
||||
ident = b"\x7fELF" + bytes((2, 1, 1, 0)) + b"\0" * 8
|
||||
header = struct.pack(
|
||||
"<16sHHIQQQIHHHHHH",
|
||||
ident,
|
||||
3,
|
||||
183,
|
||||
1,
|
||||
0,
|
||||
0,
|
||||
section_header_offset,
|
||||
0,
|
||||
64,
|
||||
0,
|
||||
0,
|
||||
64,
|
||||
len(section_headers),
|
||||
0,
|
||||
)
|
||||
image[:64] = header
|
||||
return bytes(image)
|
||||
|
||||
|
||||
def write_artifact(path: Path, *, runtime_version: str, abis: set[str]) -> None:
|
||||
with zipfile.ZipFile(path, "w") as archive:
|
||||
for abi in abis:
|
||||
prefix = f"lib/{abi}/"
|
||||
archive.writestr(
|
||||
prefix + native_compat.RUNTIME_LIBRARY,
|
||||
elf_with_ort_symbol(defined=True, version=runtime_version),
|
||||
)
|
||||
for consumer in (
|
||||
native_compat.REQUIRED_CONSUMER,
|
||||
native_compat.ORT_JAVA_CONSUMER,
|
||||
):
|
||||
archive.writestr(
|
||||
prefix + consumer,
|
||||
elf_with_ort_symbol(defined=False, version="VERS_1.27.0"),
|
||||
)
|
||||
|
||||
|
||||
class AndroidNativeCompatTest(unittest.TestCase):
|
||||
def test_parses_gnu_definition_and_requirement_versions(self) -> None:
|
||||
provider = native_compat.read_versioned_symbols(
|
||||
elf_with_ort_symbol(defined=True, version="VERS_1.27.0")
|
||||
)
|
||||
consumer = native_compat.read_versioned_symbols(
|
||||
elf_with_ort_symbol(defined=False, version="VERS_1.27.0")
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
[native_compat.VersionedSymbol(defined=True, version="VERS_1.27.0")],
|
||||
provider[native_compat.ORT_ENTRY_POINT],
|
||||
)
|
||||
self.assertEqual(
|
||||
[native_compat.VersionedSymbol(defined=False, version="VERS_1.27.0")],
|
||||
consumer[native_compat.ORT_ENTRY_POINT],
|
||||
)
|
||||
|
||||
def test_accepts_aligned_runtime_and_both_consumers(self) -> None:
|
||||
with tempfile.TemporaryDirectory() as directory:
|
||||
artifact = Path(directory) / "aligned.apk"
|
||||
write_artifact(
|
||||
artifact,
|
||||
runtime_version="VERS_1.27.0",
|
||||
abis=native_compat.SUPPORTED_ABIS,
|
||||
)
|
||||
self.assertEqual([], native_compat.check_artifact(artifact))
|
||||
|
||||
def test_rejects_runtime_symbol_version_mismatch(self) -> None:
|
||||
with tempfile.TemporaryDirectory() as directory:
|
||||
artifact = Path(directory) / "mismatch.apk"
|
||||
write_artifact(
|
||||
artifact,
|
||||
runtime_version="VERS_1.29.0",
|
||||
abis=native_compat.SUPPORTED_ABIS,
|
||||
)
|
||||
failures = native_compat.check_artifact(artifact)
|
||||
self.assertTrue(any("requires OrtGetApiBase@VERS_1.27.0" in item for item in failures))
|
||||
self.assertTrue(any(native_compat.ORT_JAVA_CONSUMER in item for item in failures))
|
||||
|
||||
def test_rejects_missing_supported_abi(self) -> None:
|
||||
with tempfile.TemporaryDirectory() as directory:
|
||||
artifact = Path(directory) / "missing-abi.apk"
|
||||
write_artifact(
|
||||
artifact,
|
||||
runtime_version="VERS_1.27.0",
|
||||
abis={"arm64-v8a"},
|
||||
)
|
||||
failures = native_compat.check_artifact(artifact)
|
||||
self.assertTrue(any("packaged ABI set" in item for item in failures))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -100,47 +100,6 @@ class FixtureTestCase(unittest.IsolatedAsyncioTestCase):
|
||||
self.assertEqual(["user", "assistant"], [row["role"] for row in history["messages"]])
|
||||
self.assertEqual(2, history["pagination"]["returned"])
|
||||
|
||||
async def test_cross_client_observer_never_claims_or_interrupts_producer(self) -> None:
|
||||
fixture, base_url = await self.start("cross_client_observation")
|
||||
producer, _ = await self.connect(base_url)
|
||||
await self.rpc(producer, 1, "session.resume", {"session_id": fixture.scenario.stored_session_id})
|
||||
await producer.receive_json()
|
||||
await self.rpc(producer, 2, "prompt.submit", {"text": "producer-only content"})
|
||||
producer_frames = await self.frames_until(
|
||||
producer,
|
||||
lambda frame: frame.get("params", {}).get("type") == "message.delta",
|
||||
)
|
||||
|
||||
observer, _ = await self.connect(base_url)
|
||||
await self.rpc(observer, 3, "session.active_list")
|
||||
active = (await observer.receive_json())["result"]["sessions"]
|
||||
self.assertEqual("working", active[0]["status"])
|
||||
async with self.session.get(
|
||||
f"{base_url}/api/sessions/{fixture.scenario.stored_session_id}/messages",
|
||||
params={"profile": "default", "limit": 500, "offset": 0, "order": "asc"},
|
||||
) as response:
|
||||
self.assertEqual(200, response.status)
|
||||
self.assertIsInstance((await response.json())["messages"], list)
|
||||
await observer.close()
|
||||
|
||||
producer_frames += await self.frames_until(
|
||||
producer,
|
||||
lambda frame: frame.get("params", {}).get("type") == "message.complete",
|
||||
)
|
||||
self.assertIn(
|
||||
"message.complete",
|
||||
[frame.get("params", {}).get("type") for frame in producer_frames],
|
||||
)
|
||||
async with self.session.get(f"{base_url}/__fixture__/evidence") as response:
|
||||
evidence = await response.json()
|
||||
observer_methods = [
|
||||
entry.get("method")
|
||||
for entry in evidence["entries"]
|
||||
if entry.get("kind") == "rpc" and entry.get("connection") == 2
|
||||
]
|
||||
self.assertEqual(["session.active_list"], observer_methods)
|
||||
self.assertNotIn("session.interrupt", observer_methods)
|
||||
|
||||
async def test_rapid_chunks_tools_and_interims_keep_wire_order(self) -> None:
|
||||
_, base_url = await self.start("rapid_tools_interims")
|
||||
ws, _ = await self.connect(base_url)
|
||||
@@ -306,7 +265,6 @@ class ScenarioTestCase(unittest.TestCase):
|
||||
"active_status_lifecycle",
|
||||
"active_status_profile_scope",
|
||||
"active_status_unsupported",
|
||||
"cross_client_observation",
|
||||
"ordinary_turn",
|
||||
"rapid_tools_interims",
|
||||
"terminal_gap_activate",
|
||||
@@ -346,10 +304,6 @@ class ScenarioTestCase(unittest.TestCase):
|
||||
("gateway.settled_session_info",),
|
||||
load_scenario("terminal_gap_session_info").contract_requirements,
|
||||
)
|
||||
self.assertEqual(
|
||||
("gateway.message_complete", "gateway.session_active_list"),
|
||||
load_scenario("cross_client_observation").contract_requirements,
|
||||
)
|
||||
|
||||
def test_tls_arguments_must_be_paired(self) -> None:
|
||||
with contextlib.redirect_stderr(io.StringIO()):
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
{
|
||||
"name": "cross_client_observation",
|
||||
"live_session_id": "fixture-desktop-live",
|
||||
"stored_session_id": "fixture-shared-session",
|
||||
"profile": "default",
|
||||
"contract_requirements": [
|
||||
"gateway.message_complete",
|
||||
"gateway.session_active_list"
|
||||
],
|
||||
"initial_history": [],
|
||||
"turns": [
|
||||
{
|
||||
"steps": [
|
||||
{"op": "event", "type": "message.start"},
|
||||
{"op": "event", "type": "message.delta", "payload": {"text": "Desktop still owns this turn."}},
|
||||
{"op": "sleep", "milliseconds": 250},
|
||||
{
|
||||
"op": "persist",
|
||||
"messages": [
|
||||
{"id": 1, "role": "user", "content": "Desktop prompt.", "timestamp": 1.0},
|
||||
{"id": 2, "role": "assistant", "content": "Desktop still owns this turn.", "timestamp": 2.0, "finish_reason": "stop"}
|
||||
]
|
||||
},
|
||||
{"op": "set_running", "value": false},
|
||||
{"op": "event", "type": "message.complete", "payload": {"text": "Desktop still owns this turn.", "status": "complete"}}
|
||||
]
|
||||
}
|
||||
],
|
||||
"active_list": {
|
||||
"supported": true,
|
||||
"snapshots": [
|
||||
[
|
||||
{"id": "fixture-desktop-live", "session_key": "fixture-shared-session", "status": "working", "current": false}
|
||||
],
|
||||
[
|
||||
{"id": "fixture-desktop-live", "session_key": "fixture-shared-session", "status": "idle", "current": false}
|
||||
]
|
||||
]
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user