@@ -13,6 +13,7 @@ import type { Message, Part } from "@opencode-ai/sdk/v2/client"
1313import { SESSION_CACHE_LIMIT , dropSessionCaches , pickSessionCacheEvictions } from "./global-sync/session-cache"
1414import { diffs as list , message as clean } from "@/utils/diffs"
1515import { useServerSDK } from "./server-sdk"
16+ import { cmpMessage , keyOf } from "./global-sync/utils"
1617
1718const SKIP_PARTS = new Set ( [ "patch" , "step-start" , "step-finish" ] )
1819
@@ -40,10 +41,10 @@ const isNotFound = (error: unknown) =>
4041 error . cause !== null &&
4142 ( error . cause as { status ?: unknown } ) . status === 404
4243
43- function merge < T extends { id : string } > ( a : readonly T [ ] , b : readonly T [ ] ) {
44+ function merge < T extends { id : string ; time ?: { created : number } } > ( a : readonly T [ ] , b : readonly T [ ] ) {
4445 const map = new Map ( a . map ( ( item ) => [ item . id , item ] as const ) )
4546 for ( const item of b ) map . set ( item . id , item )
46- return [ ...map . values ( ) ] . sort ( ( x , y ) => cmp ( x . id , y . id ) )
47+ return [ ...map . values ( ) ] . sort ( cmpMessage )
4748}
4849
4950type OptimisticStore = {
@@ -101,9 +102,15 @@ export function mergeOptimisticPage(page: MessagePage, items: OptimisticItem[])
101102 const confirmed : string [ ] = [ ]
102103
103104 for ( const item of items ) {
104- const result = Binary . search ( session , item . message . id , ( message ) => message . id )
105- const found = result . found
106- if ( ! found ) session . splice ( result . index , 0 , item . message )
105+ // The same message (same id) may already exist with a different
106+ // `time.created` (optimistic local time vs. confirmed server time), so
107+ // locate by id to avoid duplicating it; only insert when truly absent.
108+ const existing = session . findIndex ( ( m ) => m . id === item . message . id )
109+ const found = existing >= 0
110+ if ( ! found ) {
111+ const result = Binary . search ( session , keyOf ( item . message ) , keyOf )
112+ session . splice ( result . index , 0 , item . message )
113+ }
107114
108115 const current = part . get ( item . message . id )
109116 if ( found && hasParts ( current , item . parts ) ) {
@@ -126,8 +133,12 @@ export function mergeOptimisticPage(page: MessagePage, items: OptimisticItem[])
126133export function applyOptimisticAdd ( draft : OptimisticStore , input : OptimisticAddInput ) {
127134 const messages = draft . message [ input . sessionID ]
128135 if ( messages ) {
129- const result = Binary . search ( messages , input . message . id , ( m ) => m . id )
130- messages . splice ( result . index , 0 , input . message )
136+ // Locate by id so an optimistic/confirmed pair never duplicates; insert by
137+ // the time-ordered composite key only when the message is truly absent.
138+ if ( messages . findIndex ( ( m ) => m . id === input . message . id ) < 0 ) {
139+ const result = Binary . search ( messages , keyOf ( input . message ) , keyOf )
140+ messages . splice ( result . index , 0 , input . message )
141+ }
131142 } else {
132143 draft . message [ input . sessionID ] = [ input . message ]
133144 }
@@ -137,16 +148,18 @@ export function applyOptimisticAdd(draft: OptimisticStore, input: OptimisticAddI
137148export function applyOptimisticRemove ( draft : OptimisticStore , input : OptimisticRemoveInput ) {
138149 const messages = draft . message [ input . sessionID ]
139150 if ( messages ) {
140- const result = Binary . search ( messages , input . messageID , ( m ) => m . id )
141- if ( result . found ) messages . splice ( result . index , 1 )
151+ // message.removed only carries the id (no time), so locate linearly.
152+ const index = messages . findIndex ( ( m ) => m . id === input . messageID )
153+ if ( index >= 0 ) messages . splice ( index , 1 )
142154 }
143155 delete draft . part [ input . messageID ]
144156}
145157
146158function setOptimisticAdd ( setStore : ( ...args : unknown [ ] ) => void , input : OptimisticAddInput ) {
147159 setStore ( "message" , input . sessionID , ( messages : Message [ ] | undefined ) => {
148160 if ( ! messages ) return [ input . message ]
149- const result = Binary . search ( messages , input . message . id , ( m ) => m . id )
161+ if ( messages . findIndex ( ( m ) => m . id === input . message . id ) >= 0 ) return messages
162+ const result = Binary . search ( messages , keyOf ( input . message ) , keyOf )
150163 const next = [ ...messages ]
151164 next . splice ( result . index , 0 , input . message )
152165 return next
@@ -157,10 +170,11 @@ function setOptimisticAdd(setStore: (...args: unknown[]) => void, input: Optimis
157170function setOptimisticRemove ( setStore : ( ...args : unknown [ ] ) => void , input : OptimisticRemoveInput ) {
158171 setStore ( "message" , input . sessionID , ( messages : Message [ ] | undefined ) => {
159172 if ( ! messages ) return messages
160- const result = Binary . search ( messages , input . messageID , ( m ) => m . id )
161- if ( ! result . found ) return messages
173+ // message.removed only carries the id (no time), so locate linearly.
174+ const index = messages . findIndex ( ( m ) => m . id === input . messageID )
175+ if ( index < 0 ) return messages
162176 const next = [ ...messages ]
163- next . splice ( result . index , 1 )
177+ next . splice ( index , 1 )
164178 return next
165179 } )
166180 setStore ( "part" , ( part : Record < string , Part [ ] | undefined > ) => {
@@ -299,7 +313,7 @@ export const createDirSyncContext = (directory: string, serverSync: ReturnType<t
299313 input . client . session . messages ( { sessionID : input . sessionID , limit : input . limit , before : input . before } ) ,
300314 )
301315 const items = ( messages . data ?? [ ] ) . filter ( ( x ) => ! ! x ?. info ?. id )
302- const session = items . map ( ( x ) => clean ( x . info ) ) . sort ( ( a , b ) => cmp ( a . id , b . id ) )
316+ const session = items . map ( ( x ) => clean ( x . info ) ) . sort ( cmpMessage )
303317 const part = items . map ( ( message ) => ( { id : message . info . id , part : sortParts ( message . parts ) } ) )
304318 const cursor = messages . response . headers . get ( "x-next-cursor" ) ?? undefined
305319 return {
0 commit comments