Function relocateToolReferenceSiblings

src/utils/messages.ts:1933–1987

* Move text-block siblings off user messages that contain tool_reference. * * When a tool_result contains tool_reference, the server expands it to a * functions block. Any text siblings appended to that same user message * (auto-memory, skill reminders, etc.) create a second human-turn segment

(
  messages: (UserMessage | AssistantMessage)[],
)

 * finds nothing to move.
 */
function relocateToolReferenceSiblings(
  messages: (UserMessage | AssistantMessage)[],
): (UserMessage | AssistantMessage)[] {
  const result = [...messages]

  for (let i = 0; i < result.length; i++) {
    const msg = result[i]!
    if (msg.type !== 'user') continue
    const content = msg.message.content
    if (!Array.isArray(content)) continue
    if (!contentHasToolReference(content)) continue

    const textSiblings = content.filter(b => b.type === 'text')
    if (textSiblings.length === 0) continue

    // Find the next user message with tool_result but no tool_reference.
    // Skip tool_reference-containing targets — moving there would just
    // recreate the problem one position later.
    let targetIdx = -1
    for (let j = i + 1; j < result.length; j++) {
      const cand = result[j]!
      if (cand.type !== 'user') continue
      const cc = cand.message.content
      if (!Array.isArray(cc)) continue
      if (!cc.some(b => b.type === 'tool_result')) continue
      if (contentHasToolReference(cc)) continue
      targetIdx = j
      break
    }

    if (targetIdx === -1) continue // No valid target; leave in place.

    // Strip text from source, append to target.
    result[i] = {
      ...msg,
      message: {
        ...msg.message,
        content: content.filter(b => b.type !== 'text'),
      },
    }
    const target = result[targetIdx] as UserMessage
    result[targetIdx] = {
      ...target,
      message: {
        ...target.message,
        content: [
          ...(target.message.content as ContentBlockParam[]),
          ...textSiblings,
        ],
      },
    }
  }

  return result
}

export function normalizeMessagesForAPI(
  messages: Message[],