openclaw
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 3 additions & 3 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎.github/workflows/opengrep-precise.yml‎
Lines changed: 2 additions & 1 deletion b/‎.github/workflows/opengrep-precise.yml‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎.github/workflows/tui-pty.yml‎
Lines changed: 4 additions & 2 deletions b/‎.github/workflows/tui-pty.yml‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt‎
Lines changed: 11 additions & 0 deletions b/‎apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎apps/android/app/src/main/java/ai/openclaw/app/ui/CommandPalette.kt‎
Lines changed: 4 additions & 3 deletions b/‎apps/android/app/src/main/java/ai/openclaw/app/ui/CommandPalette.kt‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎apps/android/app/src/main/java/ai/openclaw/app/ui/ProvidersModelsScreen.kt‎
Lines changed: 106 additions & 17 deletions b/‎apps/android/app/src/main/java/ai/openclaw/app/ui/ProvidersModelsScreen.kt‎
Lines changed: 106 additions & 17 deletions
diff --git a/‎apps/android/app/src/main/java/ai/openclaw/app/ui/ShellScreen.kt‎
Lines changed: 11 additions & 2 deletions b/‎apps/android/app/src/main/java/ai/openclaw/app/ui/ShellScreen.kt‎
Lines changed: 11 additions & 2 deletions
@@ -92,7 +92,7 @@ jobs:
             for attempt in 1 2 3; do
               timeout --signal=TERM --kill-after=10s 30s git -C "$GITHUB_WORKSPACE" \
                 -c protocol.version=2 \
-                fetch --no-tags --prune --no-recurse-submodules --depth=1 origin \
+                fetch --no-tags --prune --no-recurse-submodules --depth=2 origin \
                 "+${ref}:refs/remotes/origin/checkout" && return 0
               fetch_status="$?"
               if [ "$fetch_status" != "124" ] && [ "$fetch_status" != "137" ]; then
@@ -146,12 +146,12 @@ jobs:
 
           if [ "${{ github.event_name }}" = "push" ]; then
             BASE="${{ github.event.before }}"
+            node scripts/ci-changed-scope.mjs --base "$BASE" --head HEAD
           else
             BASE="${{ github.event.pull_request.base.sha }}"
+            node scripts/ci-changed-scope.mjs --base "$BASE" --head HEAD --merge-head-first-parent
           fi
 
-          node scripts/ci-changed-scope.mjs --base "$BASE" --head HEAD
-
       - name: Build CI manifest
         id: manifest
         env:
 
@@ -44,7 +44,7 @@ jobs:
         uses: actions/checkout@v6
         with:
           ref: ${{ github.sha }}
-          fetch-depth: 1
+          fetch-depth: 2
           fetch-tags: false
           persist-credentials: false
           submodules: false
@@ -74,6 +74,7 @@ jobs:
       - name: Run opengrep on PR diff
         env:
           OPENCLAW_OPENGREP_BASE_REF: ${{ github.event.pull_request.base.sha }}...HEAD
+          OPENCLAW_OPENGREP_MERGE_HEAD_FIRST_PARENT: "1"
         # Findings from precise rules block this workflow. Pull requests scan
         # changed first-party source paths only so findings stay attributable to
         # the PR diff. Test/fixture/QA path exclusions live in `.semgrepignore`
 
@@ -27,7 +27,9 @@ env:
 jobs:
   tui-pty:
     runs-on: ubuntu-24.04
-    timeout-minutes: 5
+    timeout-minutes: 8
+    env:
+      OPENCLAW_TUI_PTY_INCLUDE_LOCAL: "1"
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -38,4 +40,4 @@ jobs:
           install-bun: "false"
 
       - name: Run TUI PTY tests
-        run: timeout --kill-after=30s 120s node scripts/run-vitest.mjs run --config test/vitest/vitest.tui-pty.config.ts
+        run: timeout --kill-after=30s 240s node scripts/run-vitest.mjs run --config test/vitest/vitest.tui-pty.config.ts
@@ -2085,6 +2085,7 @@ class NodeRuntime(
           id = id,
           name = obj["name"].asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() } ?: id,
           provider = provider,
+          available = obj.optionalBoolean("available"),
           supportsVision = "image" in inputTypes,
           supportsAudio = "audio" in inputTypes,
           supportsDocuments = "document" in inputTypes,
@@ -2701,6 +2702,7 @@ data class GatewayModelSummary(
   val id: String,
   val name: String,
   val provider: String,
+  val available: Boolean?,
   val supportsVision: Boolean,
   val supportsAudio: Boolean,
   val supportsDocuments: Boolean,
@@ -2883,6 +2885,15 @@ private fun JsonObject?.double(key: String): Double? = (this?.get(key) as? JsonP
 
 private fun JsonObject?.boolean(key: String): Boolean = (this?.get(key) as? JsonPrimitive)?.content?.trim() == "true"
 
+private fun JsonObject?.optionalBoolean(key: String): Boolean? =
+  (this?.get(key) as? JsonPrimitive)?.content?.trim()?.lowercase()?.let { value ->
+    when (value) {
+      "true" -> true
+      "false" -> false
+      else -> null
+    }
+  }
+
 internal fun cronJobLastRunStatus(state: JsonObject?): String? =
   state
     .cronStatus("lastStatus")
 
@@ -297,14 +297,15 @@ private fun CommandSectionLabel(title: String) {
   }
 }
 
-/** Builds provider quick-action metadata from current gateway/catalog state. */
-private fun providerCommandSubtitle(
+internal fun providerCommandSubtitle(
   isConnected: Boolean,
   providers: List<GatewayModelProviderSummary>,
   models: List<GatewayModelSummary>,
 ): String {
   if (!isConnected) return "Connect Gateway to load models"
-  val readyProviderCount = providers.count { modelProviderReady(it.status) }
+  val expiringProviderCount = expiringModelProviderCount(providers)
+  if (expiringProviderCount > 0) return "$expiringProviderCount providers expiring"
+  val readyProviderCount = readyModelProviderCount(providers, models)
   if (readyProviderCount > 0) return "$readyProviderCount providers ready"
   if (models.isNotEmpty()) return "${models.size} models available"
   return "Configure model access"
 
@@ -192,44 +192,70 @@ private data class ProviderSetupRow(
   val name: String,
   val subtitle: String,
   val ready: Boolean,
+  val available: Boolean,
+  val statusLabel: String,
+  val warning: Boolean,
 )
 
 private data class ProviderRow(
   val id: String,
   val name: String,
   val status: String,
   val ready: Boolean,
+  val available: Boolean,
+  val setupRequired: Boolean,
+  val warning: Boolean,
   val modelCount: Int,
 )
 
-/** Combines auth-provider readiness rows with catalog-only providers. */
+/** Combines auth-provider readiness rows with catalog-only browse providers. */
 private fun providerRows(
   providers: List<GatewayModelProviderSummary>,
   models: List<GatewayModelSummary>,
 ): List<ProviderRow> {
   val modelCounts = models.groupingBy { it.provider }.eachCount()
+  val availableProviderIds =
+    models
+      .filter(::modelAvailabilityUsable)
+      .map { it.provider.normalizedProviderId() }
+      .toSet()
   val authRows =
     providers.map { provider ->
-      val ready = modelProviderReady(provider.status)
+      val providerId = provider.id.normalizedProviderId()
+      val authReady = modelProviderReady(provider.status)
+      val expiring = modelProviderExpiring(provider.status)
+      val available = providerId in availableProviderIds
       ProviderRow(
         id = provider.id,
         name = provider.displayName,
-        status = if (ready) "Ready" else "Needs setup",
-        ready = ready,
+        status =
+          when {
+            authReady -> "Ready"
+            expiring -> "Expiring"
+            available -> "Available"
+            else -> "Needs setup"
+          },
+        ready = authReady,
+        available = available || authReady || expiring,
+        setupRequired = !authReady && !available && !expiring,
+        warning = expiring,
         modelCount = modelCounts[provider.id] ?: 0,
       )
     }
-  // Static/catalog-only providers may expose models without a matching auth
-  // provider row; keep them visible as ready providers.
+  // Catalog-only providers can be browsed but are not a readiness signal.
   val missingAuthRows =
     modelCounts.keys
       .filter { provider -> authRows.none { it.id == provider } }
       .map { provider ->
+        val available = provider.normalizedProviderId() in availableProviderIds
         ProviderRow(
           id = provider,
           name = providerDisplayName(provider),
-          status = "Ready",
-          ready = true,
+          status = if (available) "Available" else "Catalog",
+          ready = available,
+          available = available,
+          setupRequired = false,
+          warning = false,
           modelCount = modelCounts[provider] ?: 0,
         )
       }
@@ -245,6 +271,9 @@ private fun providerSetupRows(providerRows: List<ProviderRow>): List<ProviderSet
       name = providerDisplayName(id),
       subtitle = providerSetupSubtitle(id, row),
       ready = row?.ready == true,
+      available = row?.available == true,
+      statusLabel = providerSetupStatusLabel(row),
+      warning = row?.warning == true || row?.setupRequired == true || row == null,
     )
   }
 }
@@ -254,12 +283,24 @@ private fun providerSetupSubtitle(
   row: ProviderRow?,
 ): String =
   when {
+    row?.warning == true -> "Credential expires soon"
     row?.ready == true -> if (row.modelCount > 0) "${row.modelCount} models available" else "Ready"
-    row != null -> "Finish setup to use ${row.name}"
+    row?.available == true -> if (row.modelCount > 0) "${row.modelCount} models available" else "Available"
+    row?.setupRequired == true -> "Finish setup to use ${row.name}"
+    row != null && row.modelCount > 0 -> "${row.modelCount} catalog models"
     id == "ollama" -> "Use models running on your network"
     else -> "Add provider credentials on your Gateway"
   }
 
+private fun providerSetupStatusLabel(row: ProviderRow?): String =
+  when {
+    row?.ready == true -> "Ready"
+    row?.warning == true -> "Expiring"
+    row?.available == true -> "Available"
+    row?.setupRequired == false -> "Catalog"
+    else -> "Setup"
+  }
+
 /** Normalizes gateway provider status strings into a ready/not-ready boolean. */
 internal fun modelProviderReady(status: String): Boolean {
   val normalized = status.trim().lowercase()
@@ -270,6 +311,30 @@ internal fun modelProviderReady(status: String): Boolean {
     normalized == "static"
 }
 
+private fun modelProviderExpiring(status: String): Boolean = status.trim().lowercase() == "expiring"
+
+internal fun readyModelProviderCount(
+  providers: List<GatewayModelProviderSummary>,
+  models: List<GatewayModelSummary>,
+): Int {
+  val authReadyProviders = providers.filter { modelProviderReady(it.status) }.map { it.id.normalizedProviderId() }
+  val availableModelProviders = models.filter(::modelAvailabilityUsable).map { it.provider.normalizedProviderId() }
+  return (authReadyProviders + availableModelProviders).distinct().size
+}
+
+// Older gateways did not emit `available`; keep those rows on the legacy
+// readiness path while still honoring explicit false from upgraded gateways.
+internal fun modelAvailabilityUsable(model: GatewayModelSummary): Boolean = model.available != false
+
+internal fun expiringModelProviderCount(providers: List<GatewayModelProviderSummary>): Int =
+  providers
+    .filter { modelProviderExpiring(it.status) }
+    .map { it.id.normalizedProviderId() }
+    .distinct()
+    .size
+
+private fun String.normalizedProviderId(): String = trim().lowercase()
+
 /** Groups models by provider using the same display priority as provider rows. */
 private fun sortedModelGroups(models: List<GatewayModelSummary>): List<Pair<String, List<GatewayModelSummary>>> =
   models
@@ -299,7 +364,18 @@ private fun ProviderList(
   ClawPanel(contentPadding = PaddingValues(horizontal = 0.dp, vertical = 0.dp)) {
     Column {
       if (rows.isEmpty()) {
-        ProviderListRow(ProviderRow(id = "loading", name = "Provider catalog", status = if (refreshing) "Loading" else "No providers", ready = false, modelCount = 0))
+        ProviderListRow(
+          ProviderRow(
+            id = "loading",
+            name = "Provider catalog",
+            status = if (refreshing) "Loading" else "No providers",
+            ready = false,
+            available = false,
+            setupRequired = false,
+            warning = false,
+            modelCount = 0,
+          ),
+        )
       } else {
         val visibleRows = rows.take(5)
         visibleRows.forEachIndexed { index, row ->
@@ -322,12 +398,12 @@ private fun ProviderOverviewPanel(
   onRefresh: () -> Unit,
   onSetup: () -> Unit,
 ) {
-  val readyCount = providerRows.count { it.ready }
-  val needsSetupCount = providerRows.count { !it.ready }
+  val readyCount = providerRows.count { it.available }
+  val needsSetupCount = providerRows.count { it.setupRequired }
   ClawPanel(contentPadding = PaddingValues(horizontal = 12.dp, vertical = 12.dp)) {
     Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
       Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-        ProviderMetricTile(label = "Ready", value = readyCount.toString(), modifier = Modifier.weight(1f))
+        ProviderMetricTile(label = "Available", value = readyCount.toString(), modifier = Modifier.weight(1f))
         ProviderMetricTile(label = "Models", value = modelCount.toString(), modifier = Modifier.weight(1f))
         ProviderMetricTile(label = "Setup", value = needsSetupCount.toString(), modifier = Modifier.weight(1f))
       }
@@ -398,8 +474,14 @@ private fun ProviderSetupListRow(
         Text(text = row.subtitle, style = ClawTheme.type.caption.copy(fontSize = 12.5.sp, lineHeight = 16.sp), color = ClawTheme.colors.textMuted, maxLines = 1, overflow = TextOverflow.Ellipsis)
       }
       Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) {
-        Box(modifier = Modifier.size(5.dp).clip(CircleShape).background(if (row.ready) ClawTheme.colors.success else ClawTheme.colors.warning))
-        Text(text = if (row.ready) "Ready" else "Setup", style = ClawTheme.type.caption.copy(fontSize = 12.5.sp, lineHeight = 16.sp), color = ClawTheme.colors.textMuted, maxLines = 1)
+        val statusColor =
+          when {
+            row.warning -> ClawTheme.colors.warning
+            row.ready || row.available -> ClawTheme.colors.success
+            else -> ClawTheme.colors.textMuted
+          }
+        Box(modifier = Modifier.size(5.dp).clip(CircleShape).background(statusColor))
+        Text(text = row.statusLabel, style = ClawTheme.type.caption.copy(fontSize = 12.5.sp, lineHeight = 16.sp), color = ClawTheme.colors.textMuted, maxLines = 1)
         Icon(imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight, contentDescription = "Open ${row.name}", modifier = Modifier.size(17.dp), tint = ClawTheme.colors.text)
       }
     }
@@ -415,7 +497,13 @@ private fun ProviderListRow(row: ProviderRow) {
       Text(text = if (row.modelCount > 0) "${row.modelCount} models" else "Provider setup", style = ClawTheme.type.caption.copy(fontSize = 12.5.sp, lineHeight = 16.sp), color = ClawTheme.colors.textMuted, maxLines = 1)
     }
     Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(5.dp)) {
-      Box(modifier = Modifier.size(4.5.dp).clip(CircleShape).background(if (row.ready) ClawTheme.colors.success else ClawTheme.colors.warning))
+      val statusColor =
+        when {
+          row.warning || row.setupRequired -> ClawTheme.colors.warning
+          row.ready || row.available -> ClawTheme.colors.success
+          else -> ClawTheme.colors.textMuted
+        }
+      Box(modifier = Modifier.size(4.5.dp).clip(CircleShape).background(statusColor))
       Text(text = row.status, style = ClawTheme.type.caption.copy(fontSize = 12.5.sp, lineHeight = 16.sp), color = ClawTheme.colors.textMuted, maxLines = 1)
     }
   }
@@ -491,12 +579,13 @@ private fun ModelGroup(
 
 @Composable
 private fun ModelRow(model: GatewayModelSummary) {
+  val available = modelAvailabilityUsable(model)
   Row(modifier = Modifier.fillMaxWidth().heightIn(min = 48.dp).padding(horizontal = 10.dp, vertical = 5.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) {
     Text(text = model.name, style = ClawTheme.type.mono, color = ClawTheme.colors.text, modifier = Modifier.weight(1f), maxLines = 1, overflow = TextOverflow.Ellipsis)
     modelCapabilityLabels(model).take(3).forEach { label ->
       ProviderMiniTag(text = label)
     }
-    Box(modifier = Modifier.size(4.5.dp).clip(CircleShape).background(ClawTheme.colors.success))
+    Box(modifier = Modifier.size(4.5.dp).clip(CircleShape).background(if (available) ClawTheme.colors.success else ClawTheme.colors.warning))
   }
 }
 
 
@@ -342,14 +342,16 @@ private fun OverviewScreen(
   val cronStatus by viewModel.cronStatus.collectAsState()
   val nodesDevicesSummary by viewModel.nodesDevicesSummary.collectAsState()
   val channelsSummary by viewModel.channelsSummary.collectAsState()
-  val readyProviderCount = providers.count { modelProviderReady(it.status) }
+  val readyProviderCount = readyModelProviderCount(providers, models)
+  val expiringProviderCount = expiringModelProviderCount(providers)
   val attentionRows =
     homeAttentionRows(
       isConnected = isConnected,
       pendingApprovals = pendingToolCalls.size,
       channelsSummary = channelsSummary,
       nodesDevicesSummary = nodesDevicesSummary,
       readyProviderCount = readyProviderCount,
+      expiringProviderCount = expiringProviderCount,
     )
 
   LaunchedEffect(isConnected) {
@@ -460,6 +462,7 @@ private fun OverviewScreen(
                     when {
                       !isConnected -> "Offline"
                       readyProviderCount > 0 -> "$readyProviderCount ready"
+                      expiringProviderCount > 0 -> "$expiringProviderCount expiring"
                       models.isNotEmpty() -> "${models.size} models"
                       else -> "Setup"
                     },
@@ -541,6 +544,7 @@ internal fun homeAttentionRows(
   channelsSummary: GatewayChannelsSummary,
   nodesDevicesSummary: GatewayNodesDevicesSummary,
   readyProviderCount: Int,
+  expiringProviderCount: Int = 0,
 ): List<HomeAttentionRow> =
   listOfNotNull(
     if (!isConnected) {
@@ -563,7 +567,12 @@ internal fun homeAttentionRows(
     } else {
       null
     },
-    if (isConnected && readyProviderCount == 0) {
+    if (isConnected && expiringProviderCount > 0) {
+      HomeAttentionRow("Providers", "Provider auth expires soon", Icons.Outlined.Inventory2, Tab.ProvidersModels)
+    } else {
+      null
+    },
+    if (isConnected && readyProviderCount == 0 && expiringProviderCount == 0) {
       HomeAttentionRow("Providers", "No ready providers", Icons.Outlined.Inventory2, Tab.ProvidersModels)
     } else {
       null