singularity/singularity-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: handle BMP clipboard images on WSL2 via wl-paste PNG conversion or ImageMagick (#813) (#841)

Browse source
This commit is contained in:
Tom Boucher 2026-03-17 09:59:56 -04:00 • committed by GitHub
parent a706b4bd96
commit d593b2e367
1 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
packages/pi-coding-agent/src/utils/clipboard-image.ts
View file

@ -114,16 +114,43 @@ function readClipboardImageViaWlPaste(): ClipboardImage | null {
.filter(Boolean);
const selectedType = selectPreferredImageMimeType(types);
if (!selectedType) {
return null;
if (selectedType) {
const data = runCommand("wl-paste", ["--type", selectedType, "--no-newline"]);
if (data.ok && data.stdout.length > 0) {
return { bytes: data.stdout, mimeType: baseMimeType(selectedType) };
}
}
const data = runCommand("wl-paste", ["--type", selectedType, "--no-newline"]);
if (!data.ok || data.stdout.length === 0) {
return null;
// Fallback for WSLg/BMP: when only image/bmp is available, ask wl-paste
// to convert to PNG on the fly. wl-paste supports format conversion for
// some compositor types. If that fails, try reading BMP and converting
// via ImageMagick (#813).
const hasBmp = types.some((t) => baseMimeType(t) === "image/bmp");
if (!selectedType && hasBmp) {
// Try requesting PNG directly — wl-paste may convert
const pngData = runCommand("wl-paste", ["--type", "image/png", "--no-newline"]);
if (pngData.ok && pngData.stdout.length > 0) {
return { bytes: pngData.stdout, mimeType: "image/png" };
}
// Try reading BMP and converting via ImageMagick convert
const bmpData = runCommand("wl-paste", ["--type", "image/bmp", "--no-newline"]);
if (bmpData.ok && bmpData.stdout.length > 0) {
const converted = spawnSync("convert", ["bmp:-", "png:-"], {
input: bmpData.stdout,
timeout: 5000,
maxBuffer: DEFAULT_MAX_BUFFER_BYTES,
});
if (!converted.error && converted.status === 0 && converted.stdout.length > 0) {
const stdout = Buffer.isBuffer(converted.stdout)
? converted.stdout
: Buffer.from(converted.stdout);
return { bytes: stdout, mimeType: "image/png" };
}
}
}
return { bytes: data.stdout, mimeType: baseMimeType(selectedType) };
return null;
}
function readClipboardImageViaXclip(): ClipboardImage | null {