fix(android): scale invoke result ack timeout to invoke budget

obviyus · obviyus · commit e0f581a6501f · 2026-02-27T09:29:01.000+05:30
diff --git a/apps/android/app/src/main/java/ai/openclaw/android/gateway/GatewaySession.kt b/apps/android/app/src/main/java/ai/openclaw/android/gateway/GatewaySession.kt
@@ -501,11 +501,16 @@ class GatewaySession(
           } catch (err: Throwable) {
             invokeErrorFromThrowable(err)
           }
-        sendInvokeResult(id, nodeId, result)
+        sendInvokeResult(id, nodeId, result, timeoutMs)
       }
     }
 
-    private suspend fun sendInvokeResult(id: String, nodeId: String, result: InvokeResult) {
+    private suspend fun sendInvokeResult(
+      id: String,
+      nodeId: String,
+      result: InvokeResult,
+      invokeTimeoutMs: Long?,
+    ) {
       val parsedPayload = result.payloadJson?.let { parseJsonOrNull(it) }
       val params =
         buildJsonObject {
@@ -527,10 +532,14 @@ class GatewaySession(
             )
           }
         }
+      val ackTimeoutMs = resolveInvokeResultAckTimeoutMs(invokeTimeoutMs)
       try {
-        request("node.invoke.result", params, timeoutMs = 15_000)
+        request("node.invoke.result", params, timeoutMs = ackTimeoutMs)
       } catch (err: Throwable) {
-        Log.w(loggerTag, "node.invoke.result failed: ${err.message ?: err::class.java.simpleName}")
+        Log.w(
+          loggerTag,
+          "node.invoke.result failed (ackTimeoutMs=$ackTimeoutMs): ${err.message ?: err::class.java.simpleName}",
+        )
       }
     }
 
@@ -687,3 +696,8 @@ private fun parseJsonOrNull(payload: String): JsonElement? {
     null
   }
 }
+
+internal fun resolveInvokeResultAckTimeoutMs(invokeTimeoutMs: Long?): Long {
+  val normalized = invokeTimeoutMs?.takeIf { it > 0L } ?: 15_000L
+  return normalized.coerceIn(15_000L, 120_000L)
+}
diff --git a/apps/android/app/src/test/java/ai/openclaw/android/gateway/GatewaySessionInvokeTimeoutTest.kt b/apps/android/app/src/test/java/ai/openclaw/android/gateway/GatewaySessionInvokeTimeoutTest.kt
@@ -0,0 +1,25 @@
+package ai.openclaw.android.gateway
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class GatewaySessionInvokeTimeoutTest {
+  @Test
+  fun resolveInvokeResultAckTimeoutMs_usesFloorWhenMissingOrTooSmall() {
+    assertEquals(15_000L, resolveInvokeResultAckTimeoutMs(null))
+    assertEquals(15_000L, resolveInvokeResultAckTimeoutMs(0L))
+    assertEquals(15_000L, resolveInvokeResultAckTimeoutMs(5_000L))
+  }
+
+  @Test
+  fun resolveInvokeResultAckTimeoutMs_usesInvokeBudgetWithinBounds() {
+    assertEquals(30_000L, resolveInvokeResultAckTimeoutMs(30_000L))
+    assertEquals(90_000L, resolveInvokeResultAckTimeoutMs(90_000L))
+  }
+
+  @Test
+  fun resolveInvokeResultAckTimeoutMs_capsAtUpperBound() {
+    assertEquals(120_000L, resolveInvokeResultAckTimeoutMs(121_000L))
+    assertEquals(120_000L, resolveInvokeResultAckTimeoutMs(Long.MAX_VALUE))
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -501,11 +501,16 @@ class GatewaySession(`
`501`	`501`	`} catch (err: Throwable) {`
`502`	`502`	`invokeErrorFromThrowable(err)`
`503`	`503`	`}`
`504`		`- sendInvokeResult(id, nodeId, result)`
	`504`	`+ sendInvokeResult(id, nodeId, result, timeoutMs)`
`505`	`505`	`}`
`506`	`506`	`}`
`507`	`507`
`508`		`- private suspend fun sendInvokeResult(id: String, nodeId: String, result: InvokeResult) {`
	`508`	`+ private suspend fun sendInvokeResult(`
	`509`	`+ id: String,`
	`510`	`+ nodeId: String,`
	`511`	`+ result: InvokeResult,`
	`512`	`+ invokeTimeoutMs: Long?,`
	`513`	`+ ) {`
`509`	`514`	`val parsedPayload = result.payloadJson?.let { parseJsonOrNull(it) }`
`510`	`515`	`val params =`
`511`	`516`	`buildJsonObject {`
`@@ -527,10 +532,14 @@ class GatewaySession(`
`527`	`532`	`)`
`528`	`533`	`}`
`529`	`534`	`}`
	`535`	`+ val ackTimeoutMs = resolveInvokeResultAckTimeoutMs(invokeTimeoutMs)`
`530`	`536`	`try {`
`531`		`- request("node.invoke.result", params, timeoutMs = 15_000)`
	`537`	`+ request("node.invoke.result", params, timeoutMs = ackTimeoutMs)`
`532`	`538`	`} catch (err: Throwable) {`
`533`		`- Log.w(loggerTag, "node.invoke.result failed: ${err.message ?: err::class.java.simpleName}")`
	`539`	`+ Log.w(`
	`540`	`+ loggerTag,`
	`541`	`+ "node.invoke.result failed (ackTimeoutMs=$ackTimeoutMs): ${err.message ?: err::class.java.simpleName}",`
	`542`	`+ )`
`534`	`543`	`}`
`535`	`544`	`}`
`536`	`545`
`@@ -687,3 +696,8 @@ private fun parseJsonOrNull(payload: String): JsonElement? {`
`687`	`696`	`null`
`688`	`697`	`}`
`689`	`698`	`}`
	`699`	`+`
	`700`	`+internal fun resolveInvokeResultAckTimeoutMs(invokeTimeoutMs: Long?): Long {`
	`701`	`+ val normalized = invokeTimeoutMs?.takeIf { it > 0L } ?: 15_000L`
	`702`	`+ return normalized.coerceIn(15_000L, 120_000L)`
	`703`	`+}`