mirror of
https://github.com/stablyai/orca.git
synced 2026-09-22 08:02:28 +00:00
* fix(native-chat): keep the attachments on a Claude turn that pasted images
A Claude turn carrying pasted images reached native chat with no images at all —
no thumbnails on mobile, and not even an attachment chip on desktop. Nothing
showed that the message had any.
Both carriers were being dropped:
- Claude records the paths in a companion turn marked `isMeta`, holding one
`[Image: source: <path>]` text block per image. The decoder treats an `isMeta`
user row as injected, filters it down to tool-result blocks, and returns null
when none remain — so the whole row went away.
- The prompt row's own `image` blocks are `{source: {type: 'base64'}}`, which
carry no url or path, so `imageRefBlock` drops them too.
With the companion gone, `isImageSourceUserTurn` could never fire and the fold in
`normalizeImageTranscriptMessages` was unreachable on the Claude path.
Surveying every transcript under `~/.claude/projects`: 238 of 241 image-source
rows are `isMeta`, across every versioned release (2.1.220 through 2.1.237); the
3 that are not carry no version field at all. 38 of those rows hold more than one
content block, which also defeated the single-block rule in
`isImageSourceUserTurn`.
Let image-source text survive the injected-turn filter, and recognize a turn
whose blocks are *all* markers rather than only a lone one. An ordinary injected
turn (a skill preamble, a compact summary) is still dropped, and a turn that
mixes prose with a marker is still not an image-source turn.
Carrying the paths keeps the payload small; decoding the base64 instead would put
hundreds of KB per image on the wire to mobile.
* fix(native-chat): preserve image companion ordering
* fix(native-chat): keep image companions turn-local
---------
Co-authored-by: Merge Sim <sim@local>
284 lines
9.8 KiB
TypeScript
284 lines
9.8 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import type { NativeChatMessage } from './native-chat-types'
|
|
import {
|
|
isImageSourceUserTurn,
|
|
normalizeImageTranscriptMessages,
|
|
normalizeNativeChatUserText,
|
|
normalizedNativeChatUserMessageText,
|
|
stripImagePromptMarker
|
|
} from './native-chat-image-transcript-markers'
|
|
|
|
function userText(id: string, text: string): NativeChatMessage {
|
|
return {
|
|
id,
|
|
role: 'user',
|
|
blocks: [{ type: 'text', text }],
|
|
timestamp: 1,
|
|
source: 'transcript'
|
|
}
|
|
}
|
|
|
|
describe('normalizeImageTranscriptMessages', () => {
|
|
it('merges the paired [Image: source]/[Image #1] turns into one image-ref turn', () => {
|
|
const out = normalizeImageTranscriptMessages([
|
|
userText('a', '[Image: source: /tmp/orca-paste-1-2.png]'),
|
|
userText('b', '[Image #1] describe this')
|
|
])
|
|
expect(out).toHaveLength(1)
|
|
expect(out[0]!.blocks).toEqual([
|
|
{ type: 'image-ref', path: '/tmp/orca-paste-1-2.png' },
|
|
{ type: 'text', text: 'describe this' }
|
|
])
|
|
})
|
|
|
|
it('merges a source turn into a prompt with a trailing image marker', () => {
|
|
const out = normalizeImageTranscriptMessages([
|
|
userText('a', '[Image: source: /tmp/orca-paste-1-2.png]'),
|
|
userText('b', 'describe this[Image #1]')
|
|
])
|
|
|
|
expect(out).toHaveLength(1)
|
|
expect(out[0]!.blocks).toEqual([
|
|
{ type: 'image-ref', path: '/tmp/orca-paste-1-2.png' },
|
|
{ type: 'text', text: 'describe this' }
|
|
])
|
|
})
|
|
|
|
it('folds and strips markers in later text blocks', () => {
|
|
const prompt: NativeChatMessage = {
|
|
...userText('prompt', 'unused'),
|
|
blocks: [
|
|
{ type: 'text', text: 'describe' },
|
|
{ type: 'image-ref', path: '/tmp/existing.png' },
|
|
{ type: 'text', text: '[Image #1] this' }
|
|
]
|
|
}
|
|
const out = normalizeImageTranscriptMessages([
|
|
userText('source', '[Image: source: /tmp/a.png]'),
|
|
prompt
|
|
])
|
|
|
|
expect(out).toHaveLength(1)
|
|
expect(out[0]?.blocks).toEqual([
|
|
{ type: 'image-ref', path: '/tmp/a.png' },
|
|
{ type: 'text', text: 'describe' },
|
|
{ type: 'image-ref', path: '/tmp/existing.png' },
|
|
{ type: 'text', text: 'this' }
|
|
])
|
|
})
|
|
|
|
it.each([
|
|
['[Image #1] describe this', 'describe this'],
|
|
['[Image #1]\t describe this', 'describe this'],
|
|
[' \t[Image #1] describe this', 'describe this'],
|
|
['describe this [Image #1]', 'describe this'],
|
|
['describe this \t[Image #1]', 'describe this'],
|
|
['describe this [Image #1]\t ', 'describe this'],
|
|
['describe [Image #1] this', 'describe this'],
|
|
['describe [Image #1]\t this', 'describe \t this'],
|
|
['describe[Image #1]\t this', 'describe\t this'],
|
|
['describe\n[Image #1]\nthis', 'describe\n\nthis'],
|
|
['com[Image #1]pare this', 'compare this'],
|
|
['[Image #1] [Image #2]', ''],
|
|
['literal [Image #x] text', 'literal [Image #x] text']
|
|
])('strips image prompt markers anywhere in text', (text, expected) => {
|
|
expect(stripImagePromptMarker(text)).toBe(expected)
|
|
})
|
|
|
|
it('returns long marker-free whitespace without regex backtracking', () => {
|
|
const text = ' '.repeat(50_000)
|
|
expect(stripImagePromptMarker(text)).toBe(text)
|
|
})
|
|
|
|
it('shares marker-aware text matching across multiple text blocks', () => {
|
|
const message: NativeChatMessage = {
|
|
...userText('prompt', 'unused'),
|
|
blocks: [
|
|
{ type: 'text', text: 'look' },
|
|
{ type: 'image-ref', path: '/tmp/a.png' },
|
|
{ type: 'text', text: '[Image #1] here' }
|
|
]
|
|
}
|
|
|
|
expect(normalizeNativeChatUserText(' look [Image #1] here ')).toBe('look here')
|
|
expect(normalizedNativeChatUserMessageText(message)).toBe('look here')
|
|
})
|
|
|
|
it('recognizes only sole-text image-source user turns', () => {
|
|
const source = userText('source', '[Image: source: /tmp/a.png]')
|
|
expect(isImageSourceUserTurn(source)).toBe(true)
|
|
expect(isImageSourceUserTurn({ ...source, role: 'assistant' })).toBe(false)
|
|
expect(
|
|
isImageSourceUserTurn({
|
|
...source,
|
|
blocks: [...source.blocks, { type: 'text', text: 'caption' }]
|
|
})
|
|
).toBe(false)
|
|
})
|
|
|
|
it('converts a lone [Image: source] turn (no prompt) into an image-ref instead of raw text', () => {
|
|
const out = normalizeImageTranscriptMessages([
|
|
userText('a', '[Image: source: /Users/me/Pictures/hero-image-2.png]')
|
|
])
|
|
expect(out).toHaveLength(1)
|
|
expect(out[0]!.blocks).toEqual([
|
|
{ type: 'image-ref', path: '/Users/me/Pictures/hero-image-2.png' }
|
|
])
|
|
})
|
|
|
|
it('folds every source and strips every prompt marker for a multi-image send', () => {
|
|
const out = normalizeImageTranscriptMessages([
|
|
userText('a', '[Image: source: /tmp/a.png]'),
|
|
userText('b', '[Image: source: /tmp/b.png]'),
|
|
userText('c', '[Image: source: /tmp/c.png]'),
|
|
userText('prompt', '[Image #1] [Image #2] [Image #3] compare these')
|
|
])
|
|
|
|
expect(out).toHaveLength(1)
|
|
expect(out[0]).toMatchObject({ id: 'prompt' })
|
|
expect(out[0]!.blocks).toEqual([
|
|
{ type: 'image-ref', path: '/tmp/a.png' },
|
|
{ type: 'image-ref', path: '/tmp/b.png' },
|
|
{ type: 'image-ref', path: '/tmp/c.png' },
|
|
{ type: 'text', text: 'compare these' }
|
|
])
|
|
})
|
|
|
|
it('keeps all image refs when a multi-image send has no caption', () => {
|
|
const out = normalizeImageTranscriptMessages([
|
|
userText('a', '[Image: source: /tmp/a.png]'),
|
|
userText('b', '[Image: source: /tmp/b.png]'),
|
|
userText('prompt', '[Image #1] [Image #2]')
|
|
])
|
|
|
|
expect(out).toHaveLength(1)
|
|
expect(out[0]!.blocks).toEqual([
|
|
{ type: 'image-ref', path: '/tmp/a.png' },
|
|
{ type: 'image-ref', path: '/tmp/b.png' }
|
|
])
|
|
})
|
|
|
|
it('preserves adjacent standalone image turns without a prompt marker', () => {
|
|
const out = normalizeImageTranscriptMessages([
|
|
userText('a', '[Image: source: /tmp/a.png]'),
|
|
userText('b', '[Image: source: /tmp/b.png]')
|
|
])
|
|
|
|
expect(out).toHaveLength(2)
|
|
expect(out.map((message) => message.id)).toEqual(['a', 'b'])
|
|
expect(out.map((message) => message.blocks)).toEqual([
|
|
[{ type: 'image-ref', path: '/tmp/a.png' }],
|
|
[{ type: 'image-ref', path: '/tmp/b.png' }]
|
|
])
|
|
})
|
|
|
|
it('folds a multi-block companion turn into one turn carrying every ref', () => {
|
|
// Claude records a multi-image paste as ONE companion message with a marker block
|
|
// per image, so a single-block-only rule missed every multi-image turn.
|
|
const out = normalizeImageTranscriptMessages([
|
|
{
|
|
id: 'companion',
|
|
role: 'user',
|
|
blocks: [
|
|
{ type: 'text', text: '[Image: source: /tmp/a.png]' },
|
|
{ type: 'text', text: '[Image: source: /tmp/b.png]' }
|
|
],
|
|
timestamp: 1,
|
|
source: 'transcript'
|
|
}
|
|
])
|
|
|
|
expect(out).toHaveLength(1)
|
|
expect(out[0]!.blocks).toEqual([
|
|
{ type: 'image-ref', path: '/tmp/a.png' },
|
|
{ type: 'image-ref', path: '/tmp/b.png' }
|
|
])
|
|
})
|
|
|
|
it('does not treat a turn mixing prose with a marker as an image-source turn', () => {
|
|
const messages = [
|
|
{
|
|
id: 'mixed',
|
|
role: 'user' as const,
|
|
blocks: [
|
|
{ type: 'text' as const, text: '[Image: source: /tmp/a.png]' },
|
|
{ type: 'text' as const, text: 'and here is what I think' }
|
|
],
|
|
timestamp: 1,
|
|
source: 'transcript' as const
|
|
}
|
|
]
|
|
const out = normalizeImageTranscriptMessages(messages)
|
|
|
|
expect(out[0]!.blocks.some((block) => block.type === 'image-ref')).toBe(false)
|
|
})
|
|
|
|
it('leaves ordinary user text untouched', () => {
|
|
const message = userText('a', 'how about this')
|
|
const messages = [message]
|
|
const out = normalizeImageTranscriptMessages(messages)
|
|
expect(out).toBe(messages)
|
|
expect(out[0]).toBe(message)
|
|
expect(out[0]!.blocks).toBe(message.blocks)
|
|
})
|
|
|
|
it('removes a whitespace-only first text block', () => {
|
|
const out = normalizeImageTranscriptMessages([userText('a', ' ')])
|
|
|
|
expect(out[0]?.blocks).toEqual([])
|
|
})
|
|
|
|
it('preserves unaffected rows when another row needs normalization', () => {
|
|
const before = userText('before', 'keep this row')
|
|
const marker = userText('marker', '[Image: source: /tmp/image.png]')
|
|
const after = userText('after', 'keep this row too')
|
|
const messages = [before, marker, after]
|
|
|
|
const out = normalizeImageTranscriptMessages(messages)
|
|
|
|
expect(out).not.toBe(messages)
|
|
expect(out[0]).toBe(before)
|
|
expect(out[2]).toBe(after)
|
|
})
|
|
|
|
it('leaves assistant messages untouched', () => {
|
|
const assistant: NativeChatMessage = {
|
|
id: 'a',
|
|
role: 'assistant',
|
|
blocks: [{ type: 'text', text: '[Image: source: /tmp/x.png]' }],
|
|
timestamp: 1,
|
|
source: 'transcript'
|
|
}
|
|
expect(normalizeImageTranscriptMessages([assistant])).toEqual([assistant])
|
|
})
|
|
})
|
|
|
|
describe('normalizeNativeChatUserText control bytes', () => {
|
|
it('drops the Ctrl+U a TUI pasted in front of the prompt', () => {
|
|
expect(normalizeNativeChatUserText('\u0015run the tests')).toBe('run the tests')
|
|
})
|
|
|
|
it('drops control bytes that landed inside the prompt', () => {
|
|
expect(normalizeNativeChatUserText('run\u0015 the\u0000 tests')).toBe('run the tests')
|
|
})
|
|
|
|
it('still finds the image marker behind a leading control byte', () => {
|
|
expect(normalizeNativeChatUserText('\u0015[Image #1] describe this')).toBe('describe this')
|
|
})
|
|
|
|
// Remove a bracketed-paste wrapper as one sequence so its printable tail cannot survive.
|
|
it('drops a bracketed-paste wrapper, not just its ESC introducer', () => {
|
|
expect(normalizeNativeChatUserText('\u001b[200~/tmp/orca-paste-1.png\u001b[201~')).toBe(
|
|
'/tmp/orca-paste-1.png'
|
|
)
|
|
})
|
|
|
|
it('preserves bracketed-paste-looking text without an ESC introducer', () => {
|
|
expect(normalizeNativeChatUserText('[200~literal[201~')).toBe('[200~literal[201~')
|
|
})
|
|
|
|
it('leaves tabs, newlines and carriage returns to the whitespace collapse', () => {
|
|
expect(normalizeNativeChatUserText('run\tthe\r\ntests')).toBe('run the tests')
|
|
})
|
|
})
|