Merge branch 'main' of git.arirex.me:iris/ai-app

app/androidApp/src/main/kotlin/com/example/aiapp/ToolInput.kt

@@ -30,8 +30,8 @@ data class ToolInput(
     /** The tool's own one-line summary, when it wrote one. */
     val description: String?,
     /**
-     * How long the call may take, as the tool expressed it. Shown apart because it is a limit on
-     * the call rather than part of what the call does.
+     * How long the call may take, in the largest units it fits ([formatMillis]). Shown apart
+     * because it is a limit on the call rather than part of what the call does.
      */
     val timeout: String?,
     /** Everything else, as `name: value` lines. Never dropped. */
@@ -83,7 +83,7 @@ fun parseToolInput(tool: String, input: String): ToolInput {
     val description = DESCRIPTIONS.firstNotNullOfOrNull {
         json.optString(it).takeIf { v -> v.isNotBlank() }
     }
-    val timeout = json.optString("timeout").takeIf { it.isNotBlank() }
+    val timeout = json.optString("timeout").takeIf { it.isNotBlank() }?.let { formatMillisText(it) }
     val rest =
         json
             .keys()