pi-image-tools 1.0.3 → 1.0.5

package/src/index.ts

@@ -33,10 +33,6 @@ function getErrorMessage(error: unknown): string {
   return "Unknown error";
 }
 
-function isWindowsPlatform(platform: NodeJS.Platform = process.platform): boolean {
-  return platform === "win32";
-}
-
 function imageToBase64(image: ClipboardImage): string {
   return Buffer.from(image.bytes).toString("base64");
 }
@@ -143,10 +139,6 @@ function showRecentSelectionPreview(
 }
 
 export default function imageToolsExtension(pi: ExtensionAPI): void {
-  if (!isWindowsPlatform()) {
-    return;
-  }
-
   const pendingImages: PendingImage[] = [];
 
   registerInlineUserImagePreview(pi);

package/src/inline-user-preview.ts

@@ -8,6 +8,8 @@ import { Image, truncateToWidth, visibleWidth } from "@mariozechner/pi-tui";
 import { buildPreviewItems, type ImagePayload, type ImagePreviewItem } from "./image-preview.js";
 
 const SIXEL_IMAGE_LINE_MARKER = "\x1b_Gm=0;\x1b\\";
+const KITTY_IMAGE_LINE_MARKER = "\x1b_G";
+const ITERM_IMAGE_LINE_MARKER = "\x1b]1337;File=";
 
 type UserMessageRenderFn = (width: number) => string[];
 
@@ -78,7 +80,14 @@ function buildNativeLines(item: ImagePreviewItem, width: number): string[] {
 }
 
 function isInlineImageLine(line: string): boolean {
-  return line.startsWith(SIXEL_IMAGE_LINE_MARKER) || line.includes(SIXEL_IMAGE_LINE_MARKER);
+  return (
+    line.startsWith(SIXEL_IMAGE_LINE_MARKER) ||
+    line.includes(SIXEL_IMAGE_LINE_MARKER) ||
+    line.startsWith(KITTY_IMAGE_LINE_MARKER) ||
+    line.includes(KITTY_IMAGE_LINE_MARKER) ||
+    line.startsWith(ITERM_IMAGE_LINE_MARKER) ||
+    line.includes(ITERM_IMAGE_LINE_MARKER)
+  );
 }
 
 function fitLineToWidth(line: string, width: number): string {

package/src/keybindings.ts

@@ -3,10 +3,16 @@ import type { KeyId } from "@mariozechner/pi-tui";
 
 import type { PasteImageHandler } from "./types.js";
 
-const IMAGE_PASTE_SHORTCUTS: KeyId[] = ["alt+v", "ctrl+alt+v"];
+function getImagePasteShortcuts(platform: NodeJS.Platform = process.platform): KeyId[] {
+  if (platform === "win32") {
+    return ["alt+v", "ctrl+alt+v"];
+  }
+
+  return ["ctrl+v", "alt+v", "ctrl+alt+v"];
+}
 
 export function registerImagePasteKeybindings(pi: ExtensionAPI, handler: PasteImageHandler): void {
-  for (const shortcut of IMAGE_PASTE_SHORTCUTS) {
+  for (const shortcut of getImagePasteShortcuts()) {
     pi.registerShortcut(shortcut, {
       description: "Attach clipboard image to draft (send when ready)",
       handler,

package/src/recent-images.ts

@@ -130,11 +130,56 @@ function getDefaultWindowsSources(homeDirectory: string): RecentImageSource[] {
   ];
 }
 
-function dedupeSources(sources: readonly RecentImageSource[]): RecentImageSource[] {
+function getDefaultLinuxSources(homeDirectory: string): RecentImageSource[] {
+  return [
+    {
+      path: join(homeDirectory, "Pictures", "Screenshots"),
+      filterScreenshotNames: false,
+    },
+    {
+      path: join(homeDirectory, "Pictures"),
+      filterScreenshotNames: true,
+    },
+    {
+      path: join(homeDirectory, "Downloads"),
+      filterScreenshotNames: true,
+    },
+    {
+      path: join(homeDirectory, "Desktop"),
+      filterScreenshotNames: true,
+    },
+  ];
+}
+
+function getDefaultMacSources(homeDirectory: string): RecentImageSource[] {
+  return [
+    {
+      path: join(homeDirectory, "Desktop"),
+      filterScreenshotNames: true,
+    },
+    {
+      path: join(homeDirectory, "Downloads"),
+      filterScreenshotNames: true,
+    },
+    {
+      path: join(homeDirectory, "Pictures", "Screenshots"),
+      filterScreenshotNames: false,
+    },
+    {
+      path: join(homeDirectory, "Pictures"),
+      filterScreenshotNames: true,
+    },
+  ];
+}
+
+function dedupeSources(
+  sources: readonly RecentImageSource[],
+  platform: NodeJS.Platform,
+): RecentImageSource[] {
   const deduped = new Map<string, RecentImageSource>();
 
   for (const source of sources) {
-    const key = process.platform === "win32" ? source.path.toLowerCase() : source.path;
+    const key = platform === "win32" ? source.path.toLowerCase() : source.path;
     if (!deduped.has(key)) {
       deduped.set(key, source);
     }
@@ -220,15 +265,27 @@ function listRecentImagesFromSource(source: RecentImageSource): RecentImageCandi
   return candidates;
 }
 
+function getPlatformDefaultSources(
+  platform: NodeJS.Platform,
+  homeDirectory: string,
+): RecentImageSource[] {
+  switch (platform) {
+    case "win32":
+      return getDefaultWindowsSources(homeDirectory);
+    case "linux":
+      return getDefaultLinuxSources(homeDirectory);
+    case "darwin":
+      return getDefaultMacSources(homeDirectory);
+    default:
+      return [];
+  }
+}
+
 function buildSources(options: DiscoverRecentImagesOptions): RecentImageSource[] {
   const platform = options.platform ?? process.platform;
   const homeDirectory = options.homeDirectory ?? homedir();
   const environment = options.environment ?? process.env;
 
-  if (platform !== "win32") {
-    return [];
-  }
-
   const cacheSource: RecentImageSource = {
     path: getRecentImageCacheDirectory(environment),
     filterScreenshotNames: false,
@@ -236,23 +293,29 @@ function buildSources(options: DiscoverRecentImagesOptions): RecentImageSource[]
 
   const configuredPaths = parseConfiguredSources(environment, homeDirectory);
   if (configuredPaths.length > 0) {
-    return dedupeSources([
-      cacheSource,
-      ...configuredPaths.map((pathValue) => ({
-        path: pathValue,
-        filterScreenshotNames: false,
-      })),
-    ]);
+    return dedupeSources(
+      [
+        cacheSource,
+        ...configuredPaths.map((pathValue) => ({
+          path: pathValue,
+          filterScreenshotNames: false,
+        })),
+      ],
+      platform,
+    );
   }
 
-  return dedupeSources([cacheSource, ...getDefaultWindowsSources(homeDirectory)]);
+  return dedupeSources([cacheSource, ...getPlatformDefaultSources(platform, homeDirectory)], platform);
 }
 
-function dedupeCandidates(candidates: readonly RecentImageCandidate[]): RecentImageCandidate[] {
+function dedupeCandidates(
+  candidates: readonly RecentImageCandidate[],
+  platform: NodeJS.Platform,
+): RecentImageCandidate[] {
   const deduped = new Map<string, RecentImageCandidate>();
 
   for (const candidate of candidates) {
-    const key = process.platform === "win32" ? candidate.path.toLowerCase() : candidate.path;
+    const key = platform === "win32" ? candidate.path.toLowerCase() : candidate.path;
 
     const existing = deduped.get(key);
     if (!existing || candidate.modifiedAtMs > existing.modifiedAtMs) {
@@ -264,6 +327,7 @@ function dedupeCandidates(candidates: readonly RecentImageCandidate[]): RecentIm
 }
 
 export function discoverRecentImages(options: DiscoverRecentImagesOptions = {}): RecentImageDiscovery {
+  const platform = options.platform ?? process.platform;
   const sources = buildSources(options);
   const searchedDirectories = sources.map((source) => source.path);
   const maxItems = options.maxItems ?? DEFAULT_MAX_RECENT_IMAGES;
@@ -276,7 +340,9 @@ export function discoverRecentImages(options: DiscoverRecentImagesOptions = {}):
   }
 
   const allCandidates = sources.flatMap((source) => listRecentImagesFromSource(source));
-  const sorted = dedupeCandidates(allCandidates).sort((left, right) => right.modifiedAtMs - left.modifiedAtMs);
+  const sorted = dedupeCandidates(allCandidates, platform).sort(
+    (left, right) => right.modifiedAtMs - left.modifiedAtMs,
+  );
 
   return {
     candidates: sorted.slice(0, Math.max(1, maxItems)),
@@ -402,6 +468,10 @@ function formatSize(sizeBytes: number): string {
   return `${value.toFixed(value >= 10 ? 0 : 1)} ${units[unitIndex]}`;
 }
 
+function detectPathSeparator(pathValue: string): string {
+  return pathValue.includes("\\") ? "\\" : "/";
+}
+
 function abbreviatePath(pathValue: string, maxChars: number): string {
   if (pathValue.length <= maxChars) {
     return pathValue;
@@ -412,8 +482,9 @@ function abbreviatePath(pathValue: string, maxChars: number): string {
     return `...${fileName.slice(-(maxChars - 3))}`;
   }
 
+  const separator = detectPathSeparator(pathValue);
   const headLength = maxChars - fileName.length - 4;
-  return `${pathValue.slice(0, headLength)}...\\${fileName}`;
+  return `${pathValue.slice(0, headLength)}...${separator}${fileName}`;
 }
 
 export function formatRecentImageLabel(candidate: RecentImageCandidate, nowMs = Date.now()): string {

package/src/types.ts

@@ -1,20 +1,20 @@
-import type { ExtensionCommandContext, ExtensionContext } from "@mariozechner/pi-coding-agent";
-
-export type PasteContext = ExtensionContext | ExtensionCommandContext;
-
-export interface ClipboardImage {
-  bytes: Uint8Array;
-  mimeType: string;
-}
-
-export interface ClipboardModule {
-  hasImage: () => boolean;
-  getImageBinary: () => Promise<Array<number> | Uint8Array>;
-}
-
-export type PasteImageHandler = (ctx: PasteContext) => Promise<void>;
-
-export interface PasteImageCommandHandlers {
-  fromClipboard: PasteImageHandler;
-  fromRecent: PasteImageHandler;
-}
+import type { ExtensionCommandContext, ExtensionContext } from "@mariozechner/pi-coding-agent";
+
+export type PasteContext = ExtensionContext | ExtensionCommandContext;
+
+export interface ClipboardImage {
+  bytes: Uint8Array;
+  mimeType: string;
+}
+
+export interface ClipboardModule {
+  hasImage: () => boolean;
+  getImageBinary: () => Promise<Array<number> | Uint8Array>;
+}
+
+export type PasteImageHandler = (ctx: PasteContext) => Promise<void>;
+
+export interface PasteImageCommandHandlers {
+  fromClipboard: PasteImageHandler;
+  fromRecent: PasteImageHandler;
+}