feat(chat): Swift chat parity (abort/sessions/stream)

apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatModels.swift

@@ -1,6 +1,8 @@
 import ClawdisKit
 import Foundation
 
+// NOTE: keep this file lightweight; decode must be resilient to varying transcript formats.
+
 #if canImport(AppKit)
 import AppKit
 
@@ -11,25 +13,125 @@ import UIKit
 public typealias ClawdisPlatformImage = UIImage
 #endif
 
+public struct ClawdisChatUsageCost: Codable, Hashable, Sendable {
+    public let input: Double?
+    public let output: Double?
+    public let cacheRead: Double?
+    public let cacheWrite: Double?
+    public let total: Double?
+}
+
+public struct ClawdisChatUsage: Codable, Hashable, Sendable {
+    public let input: Int?
+    public let output: Int?
+    public let cacheRead: Int?
+    public let cacheWrite: Int?
+    public let cost: ClawdisChatUsageCost?
+    public let total: Int?
+
+    enum CodingKeys: String, CodingKey {
+        case input
+        case output
+        case cacheRead
+        case cacheWrite
+        case cost
+        case total
+        case totalTokens
+    }
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        self.input = try container.decodeIfPresent(Int.self, forKey: .input)
+        self.output = try container.decodeIfPresent(Int.self, forKey: .output)
+        self.cacheRead = try container.decodeIfPresent(Int.self, forKey: .cacheRead)
+        self.cacheWrite = try container.decodeIfPresent(Int.self, forKey: .cacheWrite)
+        self.cost = try container.decodeIfPresent(ClawdisChatUsageCost.self, forKey: .cost)
+        self.total =
+            try container.decodeIfPresent(Int.self, forKey: .total) ??
+            container.decodeIfPresent(Int.self, forKey: .totalTokens)
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encodeIfPresent(self.input, forKey: .input)
+        try container.encodeIfPresent(self.output, forKey: .output)
+        try container.encodeIfPresent(self.cacheRead, forKey: .cacheRead)
+        try container.encodeIfPresent(self.cacheWrite, forKey: .cacheWrite)
+        try container.encodeIfPresent(self.cost, forKey: .cost)
+        try container.encodeIfPresent(self.total, forKey: .total)
+    }
+}
+
 public struct ClawdisChatMessageContent: Codable, Hashable, Sendable {
     public let type: String?
     public let text: String?
+    public let thinking: String?
+    public let thinkingSignature: String?
     public let mimeType: String?
     public let fileName: String?
-    public let content: String?
+    public let content: AnyCodable?
+
+    // Tool-call fields (when `type == "toolCall"` or similar)
+    public let id: String?
+    public let name: String?
+    public let arguments: AnyCodable?
 
     public init(
         type: String?,
         text: String?,
+        thinking: String? = nil,
+        thinkingSignature: String? = nil,
         mimeType: String?,
         fileName: String?,
-        content: String?)
+        content: AnyCodable?,
+        id: String? = nil,
+        name: String? = nil,
+        arguments: AnyCodable? = nil)
     {
         self.type = type
         self.text = text
+        self.thinking = thinking
+        self.thinkingSignature = thinkingSignature
         self.mimeType = mimeType
         self.fileName = fileName
         self.content = content
+        self.id = id
+        self.name = name
+        self.arguments = arguments
+    }
+
+    enum CodingKeys: String, CodingKey {
+        case type
+        case text
+        case thinking
+        case thinkingSignature
+        case mimeType
+        case fileName
+        case content
+        case id
+        case name
+        case arguments
+    }
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        self.type = try container.decodeIfPresent(String.self, forKey: .type)
+        self.text = try container.decodeIfPresent(String.self, forKey: .text)
+        self.thinking = try container.decodeIfPresent(String.self, forKey: .thinking)
+        self.thinkingSignature = try container.decodeIfPresent(String.self, forKey: .thinkingSignature)
+        self.mimeType = try container.decodeIfPresent(String.self, forKey: .mimeType)
+        self.fileName = try container.decodeIfPresent(String.self, forKey: .fileName)
+        self.id = try container.decodeIfPresent(String.self, forKey: .id)
+        self.name = try container.decodeIfPresent(String.self, forKey: .name)
+        self.arguments = try container.decodeIfPresent(AnyCodable.self, forKey: .arguments)
+
+        if let any = try container.decodeIfPresent(AnyCodable.self, forKey: .content) {
+            self.content = any
+        } else if let str = try container.decodeIfPresent(String.self, forKey: .content) {
+            self.content = AnyCodable(str)
+        } else {
+            self.content = nil
+        }
     }
 }
 
@@ -38,27 +140,47 @@ public struct ClawdisChatMessage: Codable, Identifiable, Sendable {
     public let role: String
     public let content: [ClawdisChatMessageContent]
     public let timestamp: Double?
+    public let toolCallId: String?
+    public let usage: ClawdisChatUsage?
+    public let stopReason: String?
 
     enum CodingKeys: String, CodingKey {
-        case role, content, timestamp
+        case role
+        case content
+        case timestamp
+        case toolCallId
+        case tool_call_id
+        case usage
+        case stopReason
     }
 
     public init(
         id: UUID = .init(),
         role: String,
         content: [ClawdisChatMessageContent],
-        timestamp: Double?)
+        timestamp: Double?,
+        toolCallId: String? = nil,
+        usage: ClawdisChatUsage? = nil,
+        stopReason: String? = nil)
     {
         self.id = id
         self.role = role
         self.content = content
         self.timestamp = timestamp
+        self.toolCallId = toolCallId
+        self.usage = usage
+        self.stopReason = stopReason
     }
 
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         self.role = try container.decode(String.self, forKey: .role)
         self.timestamp = try container.decodeIfPresent(Double.self, forKey: .timestamp)
+        self.toolCallId =
+            try container.decodeIfPresent(String.self, forKey: .toolCallId) ??
+            container.decodeIfPresent(String.self, forKey: .tool_call_id)
+        self.usage = try container.decodeIfPresent(ClawdisChatUsage.self, forKey: .usage)
+        self.stopReason = try container.decodeIfPresent(String.self, forKey: .stopReason)
 
         if let decoded = try? container.decode([ClawdisChatMessageContent].self, forKey: .content) {
             self.content = decoded
@@ -71,15 +193,30 @@ public struct ClawdisChatMessage: Codable, Identifiable, Sendable {
                 ClawdisChatMessageContent(
                     type: "text",
                     text: text,
+                    thinking: nil,
+                    thinkingSignature: nil,
                     mimeType: nil,
                     fileName: nil,
-                    content: nil),
+                    content: nil,
+                    id: nil,
+                    name: nil,
+                    arguments: nil),
             ]
             return
         }
 
         self.content = []
     }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(self.role, forKey: .role)
+        try container.encodeIfPresent(self.timestamp, forKey: .timestamp)
+        try container.encodeIfPresent(self.toolCallId, forKey: .toolCallId)
+        try container.encodeIfPresent(self.usage, forKey: .usage)
+        try container.encodeIfPresent(self.stopReason, forKey: .stopReason)
+        try container.encode(self.content, forKey: .content)
+    }
 }
 
 public struct ClawdisChatHistoryPayload: Codable, Sendable {
@@ -102,6 +239,24 @@ public struct ClawdisChatEventPayload: Codable, Sendable {
     public let errorMessage: String?
 }
 
+public struct ClawdisAgentEventPayload: Codable, Sendable, Identifiable {
+    public var id: String { "\(self.runId)-\(self.seq ?? -1)" }
+    public let runId: String
+    public let seq: Int?
+    public let stream: String
+    public let ts: Int?
+    public let data: [String: AnyCodable]
+}
+
+public struct ClawdisChatPendingToolCall: Identifiable, Hashable, Sendable {
+    public var id: String { self.toolCallId }
+    public let toolCallId: String
+    public let name: String
+    public let args: AnyCodable?
+    public let startedAt: Double?
+    public let isError: Bool?
+}
+
 public struct ClawdisGatewayHealthOK: Codable, Sendable {
     public let ok: Bool?
 }