diff --git a/cli/src/claude/utils/startHappyServer.test.ts b/cli/src/claude/utils/startHappyServer.test.ts index b067ee22..b507c1c4 100644 --- a/cli/src/claude/utils/startHappyServer.test.ts +++ b/cli/src/claude/utils/startHappyServer.test.ts @@ -148,6 +148,26 @@ describe('startHappyServer skill_lookup', () => { })) }) + it('preserves the source extension when display_media title omits one', async () => { + const path = join(sandboxDir, 'plan-a.zip') + await writeFile(path, Buffer.from([0x50, 0x4b, 0x03, 0x04])) + const mcp = await connect(false) + + const result = await mcp.callTool({ + name: 'display_media', + arguments: { path, title: 'Cursor Plan A Markdown 导出' } + }) as ToolResult + + expect(result.isError).toBe(false) + expect(result.content?.[0]?.text).toContain('Displayed media: Cursor Plan A Markdown 导出.zip') + expect(sendAgentMessage).toHaveBeenCalledWith(expect.objectContaining({ + type: 'generated-image', + fileName: 'Cursor Plan A Markdown 导出.zip', + mimeType: 'application/octet-stream', + source: { ingress: 'mcp', toolName: 'display_media' } + })) + }) + it('does not expose change_title when native ACP titles are enabled', async () => { const sessionClient = { updateMetadata: vi.fn(), diff --git a/cli/src/modules/common/generatedImages.test.ts b/cli/src/modules/common/generatedImages.test.ts index 989a6d8d..2baaae1b 100644 --- a/cli/src/modules/common/generatedImages.test.ts +++ b/cli/src/modules/common/generatedImages.test.ts @@ -116,6 +116,19 @@ describe('generatedImages', () => { clearGeneratedImages() }) + it('preserves the source extension when a custom file name omits one', () => { + const file = registerGeneratedImage({ + id: 'test-zip-with-title', + path: '/tmp/plan-a.zip', + fileName: 'Cursor Plan A Markdown 导出', + mimeType: 'application/octet-stream', + bytes: Buffer.from('PK\\x03\\x04') + }) + + expect(file.fileName).toBe('Cursor Plan A Markdown 导出.zip') + clearGeneratedImages() + }) + it('snapshots image bytes at registration time', () => { const source = Buffer.from('original image bytes') const image = registerGeneratedImage({ diff --git a/cli/src/modules/common/generatedImages.ts b/cli/src/modules/common/generatedImages.ts index 7d268d5c..76767506 100644 --- a/cli/src/modules/common/generatedImages.ts +++ b/cli/src/modules/common/generatedImages.ts @@ -1,4 +1,4 @@ -import { basename } from 'node:path' +import { basename, extname } from 'node:path' import { fileURLToPath } from 'node:url' import { open } from 'node:fs/promises' import { randomUUID } from 'node:crypto' @@ -277,6 +277,14 @@ export function isInlineMediaMimeType(mimeType: string): boolean { return mimeType.startsWith('image/') || mimeType.startsWith('video/') || mimeType.startsWith('audio/') } +function preserveSourceExtension(fileName: string, path: string): string { + const sourceExtension = extname(basename(path)) + if (!sourceExtension || extname(fileName)) { + return fileName + } + return `${fileName}${sourceExtension}` +} + export function detectDisplayMediaMimeType(bytes: Uint8Array): string { const imageMimeType = detectImageMimeType(bytes) if (imageMimeType) return imageMimeType @@ -312,9 +320,10 @@ export function registerGeneratedImage(args: { id: string; path: string; mimeTyp generatedImageBytes -= previous.content.byteLength } + const fallbackFileName = basename(args.path) || `${args.id}.png` const metadata: GeneratedImageMetadata = { id: args.id, - fileName: args.fileName || basename(args.path) || `${args.id}.png`, + fileName: preserveSourceExtension(args.fileName || fallbackFileName, args.path), content, mimeType: args.mimeType, createdAt: Date.now()