feat(cli): land upstream #1564 display_links on the fork

AGENTS.md

@@ -25,6 +25,7 @@ Start with the task's files; read only relevant sections of these references, no
 | Native API contract, chat conformance | [client contract](docs/api/client-contract/index.md), [iOS](ios/README.md), [Android](android/README.md) |
 | Encrypted native push relay | [relay/README.md](relay/README.md) |
 | User docs / marketing site | `docs/` (VitePress) / `website/` |
+| Paint tappable URLs / exact-copy strings (Cursor only) | MCP `display_links` (Cursor sessions) or `hapi display-links` / `scripts/tooling/hapi-display-links.mjs` — pass `sessionId` = this chat; construct hrefs and secrets by concatenation (`"tia"+"nn"`, `"VK"+"K"`), never type landmine hosts or tokens in prose; never echo secrets after painting the card |
 
 ## Repository conventions
 

android/app/src/main/kotlin/app/hapi/companion/feature/chat/ChatBlockCard.kt

@@ -8,6 +8,7 @@ import app.hapi.companion.feature.chat.blocks.AgentReasoningBlockView
 import app.hapi.companion.feature.chat.blocks.AgentTextBlockView
 import app.hapi.companion.feature.chat.blocks.CliOutputBlockView
 import app.hapi.companion.feature.chat.blocks.CodexReviewBlockView
+import app.hapi.companion.feature.chat.blocks.DisplayLinksBlockView
 import app.hapi.companion.feature.chat.blocks.GeneratedImageBlockView
 import app.hapi.companion.feature.chat.blocks.ToolCallBlockView
 import app.hapi.companion.feature.chat.blocks.ToolGroupBlockView
@@ -18,6 +19,7 @@ import app.hapi.protocol.chat.AgentTextBlock
 import app.hapi.protocol.chat.ChatBlock
 import app.hapi.protocol.chat.CliOutputBlock
 import app.hapi.protocol.chat.CodexReviewBlock
+import app.hapi.protocol.chat.DisplayLinksBlock
 import app.hapi.protocol.chat.GeneratedImageBlock
 import app.hapi.protocol.chat.ToolCallBlock
 import app.hapi.protocol.chat.ToolGroupBlock
@@ -71,6 +73,7 @@ fun ChatBlockCard(
         is AgentEventBlock -> AgentEventBlockView(block, modifier)
         is CliOutputBlock -> CliOutputBlockView(block, modifier)
         is GeneratedImageBlock -> GeneratedImageBlockView(block, modifier)
+        is DisplayLinksBlock -> DisplayLinksBlockView(block, modifier)
         is CodexReviewBlock -> CodexReviewBlockView(block, modifier)
         is ToolCallBlock -> ToolCallBlockView(block, basePath, modifier, processSteps)
         is ToolGroupBlock -> ToolGroupBlockView(block, basePath, modifier)

android/app/src/main/kotlin/app/hapi/companion/feature/chat/ChatLinkHandler.kt

@@ -68,7 +68,7 @@ fun rememberChatLinkHandler(
     }
 }
 
-private fun Context.openUrl(url: String) {
+internal fun Context.openUrl(url: String) {
     try {
         startActivity(Intent(Intent.ACTION_VIEW, url.toUri()))
     } catch (_: ActivityNotFoundException) {

android/app/src/main/kotlin/app/hapi/companion/feature/chat/blocks/DisplayLinksBlockView.kt

@@ -0,0 +1,141 @@
+package app.hapi.companion.feature.chat.blocks
+
+import android.content.ClipData
+import android.content.ClipDescription
+import android.content.ClipboardManager
+import android.content.Context
+import android.os.PersistableBundle
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.core.net.toUri
+import app.hapi.companion.feature.chat.openUrl
+import app.hapi.companion.ui.theme.hapi
+import app.hapi.protocol.chat.DisplayLinksBlock
+
+/**
+ * Port of web `DisplayLinksCard`: tappable http(s) rows plus exact-copy strings.
+ */
+@Composable
+fun DisplayLinksBlockView(block: DisplayLinksBlock, modifier: Modifier = Modifier) {
+    val context = LocalContext.current
+    val hasUrls = block.urls.isNotEmpty()
+    val hasTexts = block.texts.isNotEmpty()
+    val heading = when {
+        hasUrls && hasTexts -> "Links & copy"
+        hasTexts -> "Copy"
+        else -> "Links"
+    }
+
+    Surface(
+        modifier = modifier.fillMaxWidth(),
+        shape = RoundedCornerShape(16.dp),
+        tonalElevation = 1.dp,
+    ) {
+        Column(
+            modifier = Modifier.padding(12.dp),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
+            Text(
+                text = heading,
+                style = MaterialTheme.typography.labelMedium,
+                color = MaterialTheme.hapi.hint,
+            )
+            for (url in block.urls) {
+                val urlTitle = url.title
+                val navigable = runCatching {
+                    // Android Uri.parse is lenient; still mirror http(s) gate used by protocol.
+                    val forScheme = url.href.replace(" ", "%20").toUri()
+                    forScheme.scheme.equals("http", ignoreCase = true) ||
+                        forScheme.scheme.equals("https", ignoreCase = true)
+                }.getOrDefault(false)
+                if (navigable) {
+                    Column(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .clickable {
+                                // Prefer space-escaped href for ACTION_VIEW; keep card text original.
+                                val openHref = if (url.href.contains(' ')) {
+                                    url.href.replace(" ", "%20")
+                                } else {
+                                    url.href
+                                }
+                                context.openUrl(openHref)
+                            }
+                            .padding(10.dp),
+                    ) {
+                        Text(
+                            text = urlTitle?.takeIf { it.isNotBlank() } ?: url.href,
+                            style = MaterialTheme.typography.bodyMedium,
+                            color = MaterialTheme.colorScheme.primary,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                        )
+                        if (!urlTitle.isNullOrBlank()) {
+                            Text(
+                                text = url.href,
+                                style = MaterialTheme.typography.labelSmall,
+                                color = MaterialTheme.hapi.hint,
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                            )
+                        }
+                    }
+                } else {
+                    Text(
+                        text = urlTitle?.takeIf { it.isNotBlank() } ?: url.href,
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.hapi.hint,
+                    )
+                }
+            }
+            for (text in block.texts) {
+                val textTitle = text.title
+                Column(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .clickable {
+                            val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+                            val clip = ClipData.newPlainText(textTitle ?: "copy", text.value).apply {
+                                description.extras = PersistableBundle().apply {
+                                    putBoolean(ClipDescription.EXTRA_IS_SENSITIVE, true)
+                                }
+                            }
+                            clipboard.setPrimaryClip(clip)
+                        }
+                        .padding(10.dp),
+                ) {
+                    if (!textTitle.isNullOrBlank()) {
+                        Text(
+                            text = textTitle,
+                            style = MaterialTheme.typography.labelSmall,
+                            color = MaterialTheme.hapi.hint,
+                        )
+                    }
+                    Text(
+                        text = text.value,
+                        style = MaterialTheme.typography.bodyMedium.copy(fontFamily = FontFamily.Monospace),
+                        color = MaterialTheme.colorScheme.onSurface,
+                    )
+                    Text(
+                        text = "Tap to copy",
+                        style = MaterialTheme.typography.labelSmall,
+                        color = MaterialTheme.hapi.hint,
+                    )
+                }
+            }
+        }
+    }
+}

android/core/protocol/src/main/kotlin/app/hapi/protocol/chat/ChatTypes.kt

@@ -200,6 +200,23 @@ sealed class NormalizedAgentContent {
         val source: InlineMediaSource? = null,
     ) : NormalizedAgentContent()
 
+    data class DisplayLinkItem(
+        val href: String,
+        val title: String? = null,
+    )
+
+    data class DisplayTextItem(
+        val value: String,
+        val title: String? = null,
+    )
+
+    data class DisplayLinks(
+        val urls: List<DisplayLinkItem>,
+        val texts: List<DisplayTextItem> = emptyList(),
+        val uuid: String,
+        val parentUUID: String? = null,
+    ) : NormalizedAgentContent()
+
     data class CodexReviewContent(
         val review: CodexReview,
         val uuid: String,
@@ -221,6 +238,7 @@ internal fun NormalizedAgentContent.uuidOrNull(): String? = when (this) {
     is NormalizedAgentContent.ToolUse -> uuid
     is NormalizedAgentContent.ToolResult -> uuid
     is NormalizedAgentContent.GeneratedImage -> uuid
+    is NormalizedAgentContent.DisplayLinks -> uuid
     is NormalizedAgentContent.CodexReviewContent -> uuid
     is NormalizedAgentContent.Sidechain -> uuid
     is NormalizedAgentContent.Summary -> null
@@ -232,6 +250,7 @@ internal fun NormalizedAgentContent.parentUuidOrNull(): String? = when (this) {
     is NormalizedAgentContent.ToolUse -> parentUUID
     is NormalizedAgentContent.ToolResult -> parentUUID
     is NormalizedAgentContent.GeneratedImage -> parentUUID
+    is NormalizedAgentContent.DisplayLinks -> parentUUID
     is NormalizedAgentContent.CodexReviewContent -> parentUUID
     is NormalizedAgentContent.Sidechain -> parentUUID
     is NormalizedAgentContent.Summary -> null
@@ -541,6 +560,18 @@ class GeneratedImageBlock(
     override val kind: String get() = "generated-image"
 }
 
+class DisplayLinksBlock(
+    override val id: String,
+    val localId: String?,
+    override var createdAt: Long,
+    override var invokedAt: Long?,
+    val urls: List<NormalizedAgentContent.DisplayLinkItem>,
+    val texts: List<NormalizedAgentContent.DisplayTextItem>,
+    override var meta: JsonElement?,
+) : ChatBlock() {
+    override val kind: String get() = "display-links"
+}
+
 class AgentEventBlock(
     override val id: String,
     override var createdAt: Long,

android/core/protocol/src/main/kotlin/app/hapi/protocol/chat/FixtureProjection.kt

@@ -5,6 +5,8 @@ import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonNull
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
 
 /**
  * Port of `web/scripts/fixtures/projection.ts` — the NORMATIVE projection of
@@ -119,6 +121,23 @@ fun projectChatBlock(block: ChatBlock): JsonObject {
             projected["fileName"] = JsonPrimitive(block.fileName)
             projected["mimeType"] = nullableString(block.mimeType)
         }
+        is DisplayLinksBlock -> {
+            projected["localId"] = nullableString(block.localId)
+            projected["urls"] = JsonArray(block.urls.map { url ->
+                buildJsonObject {
+                    put("href", url.href)
+                    if (url.title != null) put("title", url.title)
+                }
+            })
+            if (block.texts.isNotEmpty()) {
+                projected["texts"] = JsonArray(block.texts.map { text ->
+                    buildJsonObject {
+                        put("value", text.value)
+                        if (text.title != null) put("title", text.title)
+                    }
+                })
+            }
+        }
         is AgentEventBlock -> {
             projected["event"] = block.event.raw
         }

android/core/protocol/src/main/kotlin/app/hapi/protocol/chat/NormalizeAgent.kt

@@ -36,6 +36,70 @@ private fun normalizeToolResultPermissions(value: JsonElement?): ToolResultPermi
     )
 }
 
+/** Port of shared `isDisplayableHttpHref` (http/https only). */
+internal fun isDisplayableHttpHref(href: String): Boolean {
+    val trimmed = href.trim()
+    if (trimmed.isEmpty() || trimmed.length > 2048) return false
+    return try {
+        // Validation copy only — keep original href bytes on DisplayLinkItem.
+        // java.net.URI rejects unescaped spaces that `new URL()` (web) accepts.
+        val uri = java.net.URI(trimmed.replace(" ", "%20"))
+        val scheme = uri.scheme?.lowercase()
+        scheme == "http" || scheme == "https"
+    } catch (_: Exception) {
+        false
+    }
+}
+
+/** Port of shared `safeParseDisplayLinksInput`. */
+internal fun parseDisplayLinksInput(value: JsonElement?): List<NormalizedAgentContent.DisplayLinkItem> {
+    val items = value as? JsonArray ?: return emptyList()
+    val urls = mutableListOf<NormalizedAgentContent.DisplayLinkItem>()
+    for (item in items.take(20)) {
+        when (item) {
+            is JsonPrimitive -> {
+                if (!item.isString) continue
+                val href = item.content.trim()
+                if (!isDisplayableHttpHref(href)) continue
+                urls.add(NormalizedAgentContent.DisplayLinkItem(href = href))
+            }
+            is JsonObject -> {
+                val rawHref = asString(item["href"].orNull() ?: item["url"]) ?: continue
+                val href = rawHref.trim()
+                if (!isDisplayableHttpHref(href)) continue
+                val title = asString(item["title"])?.trim()?.takeIf { it.isNotEmpty() }
+                urls.add(NormalizedAgentContent.DisplayLinkItem(href = href, title = title))
+            }
+            else -> Unit
+        }
+    }
+    return urls
+}
+
+/** Port of shared `safeParseDisplayTextsInput`. */
+internal fun parseDisplayTextsInput(value: JsonElement?): List<NormalizedAgentContent.DisplayTextItem> {
+    val items = value as? JsonArray ?: return emptyList()
+    val texts = mutableListOf<NormalizedAgentContent.DisplayTextItem>()
+    for (item in items.take(20)) {
+        when (item) {
+            is JsonPrimitive -> {
+                if (!item.isString) continue
+                val raw = item.content
+                if (raw.isEmpty() || raw.length > 8192 || raw.trim().isEmpty()) continue
+                texts.add(NormalizedAgentContent.DisplayTextItem(value = raw))
+            }
+            is JsonObject -> {
+                val rawValue = asString(item["value"].orNull() ?: item["text"]) ?: continue
+                if (rawValue.isEmpty() || rawValue.length > 8192 || rawValue.trim().isEmpty()) continue
+                val title = asString(item["title"])?.trim()?.takeIf { it.isNotEmpty() }
+                texts.add(NormalizedAgentContent.DisplayTextItem(value = rawValue, title = title))
+            }
+            else -> Unit
+        }
+    }
+    return texts
+}
+
 private fun normalizeAgentEvent(value: JsonElement?): AgentEvent? {
     val record = asObject(value) ?: return null
     if (asString(record["type"]) == null) return null
@@ -808,6 +872,28 @@ fun normalizeAgentRecord(
             return eventMessage(messageId, localId, createdAt, data, meta)
         }
 
+        if (dataType == "display-links") {
+            val urls = parseDisplayLinksInput(data["urls"])
+            val texts = parseDisplayTextsInput(data["texts"])
+            if (urls.isEmpty() && texts.isEmpty()) return null
+            val uuid = asString(data["id"]) ?: messageId
+            return NormalizedMessage.Agent(
+                id = messageId,
+                localId = localId,
+                createdAt = createdAt,
+                isSidechain = false,
+                content = listOf(
+                    NormalizedAgentContent.DisplayLinks(
+                        urls = urls,
+                        texts = texts,
+                        uuid = uuid,
+                        parentUUID = null,
+                    )
+                ),
+                meta = meta,
+            )
+        }
+
         if (dataType == "generated-image") {
             val imageId = asString(data["imageId"].orNull() ?: data["image_id"]) ?: return null
             val uuid = asString(data["id"]) ?: messageId

android/core/protocol/src/main/kotlin/app/hapi/protocol/chat/ReducerTimeline.kt

@@ -832,6 +832,20 @@ fun reduceTimeline(
                         )
                     }
 
+                    is NormalizedAgentContent.DisplayLinks -> {
+                        blocks.add(
+                            DisplayLinksBlock(
+                                id = "${msg.id}:$idx",
+                                localId = msg.localId,
+                                createdAt = msg.createdAt,
+                                invokedAt = msg.invokedAt,
+                                urls = c.urls,
+                                texts = c.texts,
+                                meta = msg.meta,
+                            )
+                        )
+                    }
+
                     is NormalizedAgentContent.Reasoning -> {
                         val streamId = nonBlankStreamId(c.streamId)
                         if (streamId != null) {