fix(ios): keep chat segment IDs out of localization

steipete · steipete · commit 72e1ab863487 · 2026-07-09T06:48:57.000-04:00
diff --git a/apps/.i18n/native-source.json b/apps/.i18n/native-source.json
@@ -21851,79 +21851,79 @@
     },
     {
       "kind": "ui-call",
-      "line": 440,
+      "line": 438,
       "path": "apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatView.swift",
       "source": "Retry Send",
       "surface": "apple",
       "id": "native.apple.5824df4efbf6c977"
     },
     {
       "kind": "ui-call",
-      "line": 454,
+      "line": 452,
       "path": "apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatView.swift",
       "source": "Delete",
       "surface": "apple",
       "id": "native.apple.cdad35e9657fa693"
     },
     {
       "kind": "ui-call",
-      "line": 485,
+      "line": 483,
       "path": "apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatView.swift",
       "source": "Stop Listening",
       "surface": "apple",
       "id": "native.apple.9d58b2a2a23c0d69"
     },
     {
       "kind": "ui-call",
-      "line": 488,
+      "line": 486,
       "path": "apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatView.swift",
       "source": "Listen",
       "surface": "apple",
       "id": "native.apple.99df7de891c8235f"
     },
     {
       "kind": "ui-call",
-      "line": 535,
+      "line": 533,
       "path": "apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatView.swift",
       "source": "Copy Message",
       "surface": "apple",
       "id": "native.apple.fe9f30f12f1dcfaf"
     },
     {
       "kind": "ui-call",
-      "line": 594,
+      "line": 592,
       "path": "apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatView.swift",
       "source": "Jump to latest",
       "surface": "apple",
       "id": "native.apple.f84b674ad395b694"
     },
     {
       "kind": "ui-modifier",
-      "line": 605,
+      "line": 603,
       "path": "apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatView.swift",
       "source": "Jump to latest reply",
       "surface": "apple",
       "id": "native.apple.429d825201b2cb85"
     },
     {
       "kind": "ui-named-argument",
-      "line": 625,
+      "line": 623,
       "path": "apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatView.swift",
       "source": "Refresh",
       "surface": "apple",
       "id": "native.apple.9ab586b85834705c"
     },
     {
       "kind": "ui-call",
-      "line": 1050,
+      "line": 1049,
       "path": "apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatView.swift",
       "source": "Loading chat",
       "surface": "apple",
       "id": "native.apple.28c2691c03030434"
     },
     {
       "kind": "ui-modifier",
-      "line": 1130,
+      "line": 1129,
       "path": "apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatView.swift",
       "source": "Dismiss",
       "surface": "apple",
diff --git a/apps/shared/OpenClawKit/Sources/OpenClawChatUI/AssistantTextParser.swift b/apps/shared/OpenClawKit/Sources/OpenClawChatUI/AssistantTextParser.swift
@@ -6,7 +6,7 @@ struct AssistantTextSegment: Identifiable {
         case response
     }
 
-    let id: String
+    let id: Int
     let kind: Kind
     let text: String
 }
@@ -16,7 +16,7 @@ enum AssistantTextParser {
         let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !trimmed.isEmpty else { return [] }
         guard raw.contains("<") else {
-            return [AssistantTextSegment(id: "response-0", kind: .response, text: trimmed)]
+            return [AssistantTextSegment(id: 0, kind: .response, text: trimmed)]
         }
 
         var segments: [AssistantTextSegment] = []
@@ -51,7 +51,7 @@ enum AssistantTextParser {
         }
 
         guard matchedTag else {
-            return [AssistantTextSegment(id: "response-0", kind: .response, text: trimmed)]
+            return [AssistantTextSegment(id: 0, kind: .response, text: trimmed)]
         }
 
         if includeThinking {
@@ -148,7 +148,6 @@ enum AssistantTextParser {
         guard !trimmed.isEmpty else { return }
         // Parsing repeats during unrelated view updates. Stable positional IDs keep
         // SwiftUI from rebuilding unchanged markdown segments and visibly flickering.
-        let idPrefix = kind == .thinking ? "thinking" : "response"
-        segments.append(AssistantTextSegment(id: "\(idPrefix)-\(segments.count)", kind: kind, text: trimmed))
+        segments.append(AssistantTextSegment(id: segments.count, kind: kind, text: trimmed))
     }
 }
diff --git a/apps/shared/OpenClawKit/Tests/OpenClawKitTests/AssistantTextParserTests.swift b/apps/shared/OpenClawKit/Tests/OpenClawKitTests/AssistantTextParserTests.swift
@@ -54,7 +54,7 @@ import Testing
         let first = AssistantTextParser.segments(from: raw, includeThinking: true)
         let second = AssistantTextParser.segments(from: raw, includeThinking: true)
 
-        #expect(first.map(\.id) == ["thinking-0", "response-1"])
+        #expect(first.map(\.id) == [0, 1])
         #expect(first.map(\.id) == second.map(\.id))
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ struct AssistantTextSegment: Identifiable {`
`6`	`6`	`case response`
`7`	`7`	`}`
`8`	`8`
`9`		`- let id: String`
	`9`	`+ let id: Int`
`10`	`10`	`let kind: Kind`
`11`	`11`	`let text: String`
`12`	`12`	`}`
`@@ -16,7 +16,7 @@ enum AssistantTextParser {`
`16`	`16`	`let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)`
`17`	`17`	`guard !trimmed.isEmpty else { return [] }`
`18`	`18`	`guard raw.contains("<") else {`
`19`		`- return [AssistantTextSegment(id: "response-0", kind: .response, text: trimmed)]`
	`19`	`+ return [AssistantTextSegment(id: 0, kind: .response, text: trimmed)]`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`var segments: [AssistantTextSegment] = []`
`@@ -51,7 +51,7 @@ enum AssistantTextParser {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`guard matchedTag else {`
`54`		`- return [AssistantTextSegment(id: "response-0", kind: .response, text: trimmed)]`
	`54`	`+ return [AssistantTextSegment(id: 0, kind: .response, text: trimmed)]`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`if includeThinking {`
`@@ -148,7 +148,6 @@ enum AssistantTextParser {`
`148`	`148`	`guard !trimmed.isEmpty else { return }`
`149`	`149`	`// Parsing repeats during unrelated view updates. Stable positional IDs keep`
`150`	`150`	`// SwiftUI from rebuilding unchanged markdown segments and visibly flickering.`
`151`		`- let idPrefix = kind == .thinking ? "thinking" : "response"`
`152`		`- segments.append(AssistantTextSegment(id: "\(idPrefix)-\(segments.count)", kind: kind, text: trimmed))`
	`151`	`+ segments.append(AssistantTextSegment(id: segments.count, kind: kind, text: trimmed))`
`153`	`152`	`}`
`154`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ import Testing`
`54`	`54`	`let first = AssistantTextParser.segments(from: raw, includeThinking: true)`
`55`	`55`	`let second = AssistantTextParser.segments(from: raw, includeThinking: true)`
`56`	`56`
`57`		`- #expect(first.map(\.id) == ["thinking-0", "response-1"])`
	`57`	`+ #expect(first.map(\.id) == [0, 1])`
`58`	`58`	`#expect(first.map(\.id) == second.map(\.id))`
`59`	`59`	`}`
`60`	`60`	`}`