pi-image-tools 1.3.0 → 1.3.1

package/src/keybindings.ts

@@ -72,49 +72,51 @@ const LEGACY_KEYBINDING_NAME_MIGRATIONS: Record<string, string> = {
   deleteSessionNoninvasive: "app.session.deleteNoninvasive",
 };
 
-const APP_KEYBINDING_DEFAULTS: KeybindingDefaults = {
-  "app.interrupt": "escape",
-  "app.clear": "ctrl+c",
-  "app.exit": "ctrl+d",
-  "app.suspend": process.platform === "win32" ? [] : "ctrl+z",
-  "app.thinking.cycle": "shift+tab",
-  "app.model.cycleForward": "ctrl+p",
-  "app.model.cycleBackward": "shift+ctrl+p",
-  "app.model.select": "ctrl+l",
-  "app.tools.expand": "ctrl+o",
-  "app.thinking.toggle": "ctrl+t",
-  "app.session.toggleNamedFilter": "ctrl+n",
-  "app.editor.external": "ctrl+g",
-  "app.message.followUp": "alt+enter",
-  "app.message.dequeue": "alt+up",
-  "app.clipboard.pasteImage": process.platform === "win32" ? "alt+v" : "ctrl+v",
-  "app.session.new": [],
-  "app.session.tree": [],
-  "app.session.fork": [],
-  "app.session.resume": [],
-  "app.tree.foldOrUp": ["ctrl+left", "alt+left"],
-  "app.tree.unfoldOrDown": ["ctrl+right", "alt+right"],
-  "app.tree.editLabel": "shift+l",
-  "app.tree.toggleLabelTimestamp": "shift+t",
-  "app.session.togglePath": "ctrl+p",
-  "app.session.toggleSort": "ctrl+s",
-  "app.session.rename": "ctrl+r",
-  "app.session.delete": "ctrl+d",
-  "app.session.deleteNoninvasive": "ctrl+backspace",
-  "app.models.save": "ctrl+s",
-  "app.models.enableAll": "ctrl+a",
-  "app.models.clearAll": "ctrl+x",
-  "app.models.toggleProvider": "ctrl+p",
-  "app.models.reorderUp": "alt+up",
-  "app.models.reorderDown": "alt+down",
-  "app.tree.filter.default": "ctrl+d",
-  "app.tree.filter.noTools": "ctrl+t",
-  "app.tree.filter.userOnly": "ctrl+u",
-  "app.tree.filter.labeledOnly": "ctrl+l",
-  "app.tree.filter.all": "ctrl+a",
-  "app.tree.filter.cycleForward": "ctrl+o",
-  "app.tree.filter.cycleBackward": "shift+ctrl+o",
-};
+function getAppKeybindingDefaults(platform: NodeJS.Platform): KeybindingDefaults {
+  return {
+    "app.interrupt": "escape",
+    "app.clear": "ctrl+c",
+    "app.exit": "ctrl+d",
+    "app.suspend": platform === "win32" ? [] : "ctrl+z",
+    "app.thinking.cycle": "shift+tab",
+    "app.model.cycleForward": "ctrl+p",
+    "app.model.cycleBackward": "shift+ctrl+p",
+    "app.model.select": "ctrl+l",
+    "app.tools.expand": "ctrl+o",
+    "app.thinking.toggle": "ctrl+t",
+    "app.session.toggleNamedFilter": "ctrl+n",
+    "app.editor.external": "ctrl+g",
+    "app.message.followUp": "alt+enter",
+    "app.message.dequeue": "alt+up",
+    "app.clipboard.pasteImage": platform === "win32" ? "alt+v" : "ctrl+v",
+    "app.session.new": [],
+    "app.session.tree": [],
+    "app.session.fork": [],
+    "app.session.resume": [],
+    "app.tree.foldOrUp": ["ctrl+left", "alt+left"],
+    "app.tree.unfoldOrDown": ["ctrl+right", "alt+right"],
+    "app.tree.editLabel": "shift+l",
+    "app.tree.toggleLabelTimestamp": "shift+t",
+    "app.session.togglePath": "ctrl+p",
+    "app.session.toggleSort": "ctrl+s",
+    "app.session.rename": "ctrl+r",
+    "app.session.delete": "ctrl+d",
+    "app.session.deleteNoninvasive": "ctrl+backspace",
+    "app.models.save": "ctrl+s",
+    "app.models.enableAll": "ctrl+a",
+    "app.models.clearAll": "ctrl+x",
+    "app.models.toggleProvider": "ctrl+p",
+    "app.models.reorderUp": "alt+up",
+    "app.models.reorderDown": "alt+down",
+    "app.tree.filter.default": "ctrl+d",
+    "app.tree.filter.noTools": "ctrl+t",
+    "app.tree.filter.userOnly": "ctrl+u",
+    "app.tree.filter.labeledOnly": "ctrl+l",
+    "app.tree.filter.all": "ctrl+a",
+    "app.tree.filter.cycleForward": "ctrl+o",
+    "app.tree.filter.cycleBackward": "shift+ctrl+o",
+  };
+}
 
 export interface RegisterImagePasteKeybindingsOptions {
   config: ImageToolsConfig;
@@ -186,7 +188,7 @@ function normalizeUserKeybindings(rawConfig: Record<string, unknown> | undefined
   return userKeybindings;
 }
 
-function getBuiltinKeybindingDefaults(): KeybindingDefaults {
+function getBuiltinKeybindingDefaults(platform: NodeJS.Platform): KeybindingDefaults {
   const tuiDefaults: KeybindingDefaults = {};
   for (const [keybinding, definition] of Object.entries(TUI_KEYBINDINGS)) {
     tuiDefaults[keybinding] = definition.defaultKeys;
@@ -194,12 +196,12 @@ function getBuiltinKeybindingDefaults(): KeybindingDefaults {
 
   return {
     ...tuiDefaults,
-    ...APP_KEYBINDING_DEFAULTS,
+    ...getAppKeybindingDefaults(platform),
   };
 }
 
-function getConfiguredBuiltinShortcuts(): Set<string> {
-  const defaults = getBuiltinKeybindingDefaults();
+function getConfiguredBuiltinShortcuts(platform: NodeJS.Platform): Set<string> {
+  const defaults = getBuiltinKeybindingDefaults(platform);
   const userKeybindings = normalizeUserKeybindings(readKeybindingsConfig());
   const builtinShortcuts = new Set<string>();
 
@@ -224,8 +226,8 @@ function getImagePasteShortcutCandidates(platform: NodeJS.Platform): KeyId[] {
   return ["ctrl+v", "alt+v", "ctrl+alt+v"];
 }
 
-function removeBuiltinConflicts(shortcuts: readonly KeyId[]): KeyId[] {
-  const builtinShortcuts = getConfiguredBuiltinShortcuts();
+function removeBuiltinConflicts(shortcuts: readonly KeyId[], platform: NodeJS.Platform): KeyId[] {
+  const builtinShortcuts = getConfiguredBuiltinShortcuts(platform);
 
   return shortcuts.filter((shortcut) => !builtinShortcuts.has(normalizeShortcutKey(shortcut)));
 }
@@ -238,7 +240,7 @@ export function getImagePasteShortcuts(
     config.shortcuts.avoidBuiltinConflicts || config.shortcuts.suppressBuiltinConflictWarnings;
   const candidates = config.shortcuts.pasteImage ?? getImagePasteShortcutCandidates(platform);
 
-  return shouldAvoidBuiltinConflicts ? removeBuiltinConflicts(candidates) : [...candidates];
+  return shouldAvoidBuiltinConflicts ? removeBuiltinConflicts(candidates, platform) : [...candidates];
 }
 
 export function registerImagePasteKeybindings(

package/src/providers/command-runner.ts

@@ -1,68 +1,68 @@
-import { spawnSync } from "node:child_process";
-
-import { isErrnoException } from "../errors.js";
-
-export const LIST_TYPES_TIMEOUT_MS = 1000;
-export const READ_TIMEOUT_MS = 5000;
-export const MAX_BUFFER_BYTES = 50 * 1024 * 1024;
-
-export interface CommandResult {
-  ok: boolean;
-  stdout: Buffer;
-  stderr: Buffer;
-  missingCommand: boolean;
-  status: number | null;
-}
-
-export interface CommandRunOptions {
-  environment?: NodeJS.ProcessEnv;
-  maxBuffer?: number;
-  timeout: number;
-  windowsHide?: boolean;
-}
-
-export type CommandRunner = (
-  command: string,
-  args: readonly string[],
-  options: CommandRunOptions,
-) => CommandResult;
-
-function toBuffer(value: unknown): Buffer {
-  if (Buffer.isBuffer(value)) {
-    return value;
-  }
-
-  if (value instanceof Uint8Array) {
-    return Buffer.from(value);
-  }
-
-  return Buffer.from(value === undefined || value === null ? "" : String(value), "utf8");
-}
-
-export const defaultCommandRunner: CommandRunner = (command, args, options) => {
-  const result = spawnSync(command, [...args], {
-    env: options.environment,
-    maxBuffer: options.maxBuffer ?? MAX_BUFFER_BYTES,
-    stdio: ["ignore", "pipe", "pipe"],
-    timeout: options.timeout,
-    windowsHide: options.windowsHide,
-  });
-
-  if (result.error) {
-    return {
-      ok: false,
-      stdout: toBuffer(result.stdout),
-      stderr: toBuffer(result.stderr),
-      missingCommand: isErrnoException(result.error) && result.error.code === "ENOENT",
-      status: result.status ?? null,
-    };
-  }
-
-  return {
-    ok: result.status === 0,
-    stdout: toBuffer(result.stdout),
-    stderr: toBuffer(result.stderr),
-    missingCommand: false,
-    status: result.status ?? null,
-  };
-};
+import { spawnSync } from "node:child_process";
+
+import { isErrnoException } from "../errors.js";
+
+export const LIST_TYPES_TIMEOUT_MS = 1000;
+export const READ_TIMEOUT_MS = 5000;
+export const MAX_BUFFER_BYTES = 50 * 1024 * 1024;
+
+export interface CommandResult {
+  ok: boolean;
+  stdout: Buffer;
+  stderr: Buffer;
+  missingCommand: boolean;
+  status: number | null;
+}
+
+export interface CommandRunOptions {
+  environment?: NodeJS.ProcessEnv;
+  maxBuffer?: number;
+  timeout: number;
+  windowsHide?: boolean;
+}
+
+export type CommandRunner = (
+  command: string,
+  args: readonly string[],
+  options: CommandRunOptions,
+) => CommandResult;
+
+function toBuffer(value: unknown): Buffer {
+  if (Buffer.isBuffer(value)) {
+    return value;
+  }
+
+  if (value instanceof Uint8Array) {
+    return Buffer.from(value);
+  }
+
+  return Buffer.from(value === undefined || value === null ? "" : String(value), "utf8");
+}
+
+export const defaultCommandRunner: CommandRunner = (command, args, options) => {
+  const result = spawnSync(command, [...args], {
+    env: options.environment,
+    maxBuffer: options.maxBuffer ?? MAX_BUFFER_BYTES,
+    stdio: ["ignore", "pipe", "pipe"],
+    timeout: options.timeout,
+    windowsHide: options.windowsHide,
+  });
+
+  if (result.error) {
+    return {
+      ok: false,
+      stdout: toBuffer(result.stdout),
+      stderr: toBuffer(result.stderr),
+      missingCommand: isErrnoException(result.error) && result.error.code === "ENOENT",
+      status: result.status ?? null,
+    };
+  }
+
+  return {
+    ok: result.status === 0,
+    stdout: toBuffer(result.stdout),
+    stderr: toBuffer(result.stderr),
+    missingCommand: false,
+    status: result.status ?? null,
+  };
+};

package/src/providers/mac-osascript-pngf.ts

@@ -1,101 +1,101 @@
-import { buildNamespaceWrappedCommand, defaultCommandExists, type CommandExists } from "../shell-environment.js";
-import {
-  defaultCommandRunner,
-  MAX_BUFFER_BYTES,
-  READ_TIMEOUT_MS,
-  type CommandRunner,
-} from "./command-runner.js";
-import type { ClipboardImageProvider, ClipboardProviderContext, ClipboardReadResult } from "./types.js";
-
-const PNGF_SCRIPT = `try
-  set imageData to the clipboard as «class PNGf»
-  return imageData
-on error
-  return ""
-end try`;
-
-export interface OsascriptPngfProviderOptions {
-  priority?: number;
-  commandRunner?: CommandRunner;
-  commandExists?: CommandExists;
-}
-
-function parseAppleScriptPngfData(stdout: Buffer): Uint8Array | null {
-  const text = stdout.toString("utf8").trim();
-  if (text.length === 0) {
-    return null;
-  }
-
-  const match = text.match(/«data\s+PNGf([0-9a-fA-F\s]+)»/i);
-  if (!match) {
-    return null;
-  }
-
-  const hex = match[1]?.replace(/\s+/g, "") ?? "";
-  if (hex.length === 0 || hex.length % 2 !== 0) {
-    return null;
-  }
-
-  const bytes = Buffer.from(hex, "hex");
-  return bytes.length > 0 ? new Uint8Array(bytes) : null;
-}
-
-export class OsascriptPngfProvider implements ClipboardImageProvider {
-  readonly capabilities;
-  private readonly commandRunner: CommandRunner;
-  private readonly commandExists: CommandExists;
-
-  constructor(options: OsascriptPngfProviderOptions = {}) {
-    this.capabilities = {
-      id: "mac-osascript-pngf",
-      name: "osascript PNGf",
-      platforms: ["darwin"],
-      priority: options.priority ?? 30,
-    };
-    this.commandRunner = options.commandRunner ?? defaultCommandRunner;
-    this.commandExists = options.commandExists ?? defaultCommandExists;
-  }
-
-  isAvailable(context: ClipboardProviderContext): boolean {
-    try {
-      return this.commandExists("osascript", context);
-    } catch {
-      return false;
-    }
-  }
-
-  read(context: ClipboardProviderContext): ClipboardReadResult {
-    const wrapped = buildNamespaceWrappedCommand(
-      "osascript",
-      ["-e", PNGF_SCRIPT],
-      context,
-      this.commandExists,
-    );
-    const result = this.commandRunner(wrapped.command, wrapped.args, {
-      environment: context.environment,
-      maxBuffer: MAX_BUFFER_BYTES,
-      timeout: READ_TIMEOUT_MS,
-    });
-
-    if (result.missingCommand) {
-      return { available: false, image: null };
-    }
-
-    if (!result.ok || result.stdout.length === 0) {
-      return { available: true, image: null };
-    }
-
-    const bytes = parseAppleScriptPngfData(result.stdout);
-    if (!bytes) {
-      return { available: true, image: null };
-    }
-
-    return {
-      available: true,
-      image: {
-        bytes,
-        mimeType: "image/png",
-      },
-    };
-  }
-}
+import { buildNamespaceWrappedCommand, defaultCommandExists, type CommandExists } from "../shell-environment.js";
+import {
+  defaultCommandRunner,
+  MAX_BUFFER_BYTES,
+  READ_TIMEOUT_MS,
+  type CommandRunner,
+} from "./command-runner.js";
+import type { ClipboardImageProvider, ClipboardProviderContext, ClipboardReadResult } from "./types.js";
+
+const PNGF_SCRIPT = `try
+  set imageData to the clipboard as «class PNGf»
+  return imageData
+on error
+  return ""
+end try`;
+
+export interface OsascriptPngfProviderOptions {
+  priority?: number;
+  commandRunner?: CommandRunner;
+  commandExists?: CommandExists;
+}
+
+function parseAppleScriptPngfData(stdout: Buffer): Uint8Array | null {
+  const text = stdout.toString("utf8").trim();
+  if (text.length === 0) {
+    return null;
+  }
+
+  const match = text.match(/«data\s+PNGf([0-9a-fA-F\s]+)»/i);
+  if (!match) {
+    return null;
+  }
+
+  const hex = match[1]?.replace(/\s+/g, "") ?? "";
+  if (hex.length === 0 || hex.length % 2 !== 0) {
+    return null;
+  }
+
+  const bytes = Buffer.from(hex, "hex");
+  return bytes.length > 0 ? new Uint8Array(bytes) : null;
+}
+
+export class OsascriptPngfProvider implements ClipboardImageProvider {
+  readonly capabilities;
+  private readonly commandRunner: CommandRunner;
+  private readonly commandExists: CommandExists;
+
+  constructor(options: OsascriptPngfProviderOptions = {}) {
+    this.capabilities = {
+      id: "mac-osascript-pngf",
+      name: "osascript PNGf",
+      platforms: ["darwin"],
+      priority: options.priority ?? 30,
+    };
+    this.commandRunner = options.commandRunner ?? defaultCommandRunner;
+    this.commandExists = options.commandExists ?? defaultCommandExists;
+  }
+
+  isAvailable(context: ClipboardProviderContext): boolean {
+    try {
+      return this.commandExists("osascript", context);
+    } catch {
+      return false;
+    }
+  }
+
+  read(context: ClipboardProviderContext): ClipboardReadResult {
+    const wrapped = buildNamespaceWrappedCommand(
+      "osascript",
+      ["-e", PNGF_SCRIPT],
+      context,
+      this.commandExists,
+    );
+    const result = this.commandRunner(wrapped.command, wrapped.args, {
+      environment: context.environment,
+      maxBuffer: MAX_BUFFER_BYTES,
+      timeout: READ_TIMEOUT_MS,
+    });
+
+    if (result.missingCommand) {
+      return { available: false, image: null };
+    }
+
+    if (!result.ok || result.stdout.length === 0) {
+      return { available: true, image: null };
+    }
+
+    const bytes = parseAppleScriptPngfData(result.stdout);
+    if (!bytes) {
+      return { available: true, image: null };
+    }
+
+    return {
+      available: true,
+      image: {
+        bytes,
+        mimeType: "image/png",
+      },
+    };
+  }
+}

package/src/providers/mac-osascript-publicpng.ts

@@ -1,77 +1,77 @@
-import { buildNamespaceWrappedCommand, defaultCommandExists, type CommandExists } from "../shell-environment.js";
-import {
-  defaultCommandRunner,
-  MAX_BUFFER_BYTES,
-  READ_TIMEOUT_MS,
-  type CommandRunner,
-} from "./command-runner.js";
-import type { ClipboardImageProvider, ClipboardProviderContext, ClipboardReadResult } from "./types.js";
-
-const PUBLIC_PNG_SCRIPT = `ObjC.import('AppKit');
-const pasteboard = $.NSPasteboard.generalPasteboard;
-const data = pasteboard.dataForType('public.png');
-if (!data) {
-  $.exit(2);
-}
-$.NSFileHandle.fileHandleWithStandardOutput.writeData(data);`;
-
-export interface OsascriptPublicPngProviderOptions {
-  priority?: number;
-  commandRunner?: CommandRunner;
-  commandExists?: CommandExists;
-}
-
-export class OsascriptPublicPngProvider implements ClipboardImageProvider {
-  readonly capabilities;
-  private readonly commandRunner: CommandRunner;
-  private readonly commandExists: CommandExists;
-
-  constructor(options: OsascriptPublicPngProviderOptions = {}) {
-    this.capabilities = {
-      id: "mac-osascript-public-png",
-      name: "osascript public.png",
-      platforms: ["darwin"],
-      priority: options.priority ?? 20,
-    };
-    this.commandRunner = options.commandRunner ?? defaultCommandRunner;
-    this.commandExists = options.commandExists ?? defaultCommandExists;
-  }
-
-  isAvailable(context: ClipboardProviderContext): boolean {
-    try {
-      return this.commandExists("osascript", context);
-    } catch {
-      return false;
-    }
-  }
-
-  read(context: ClipboardProviderContext): ClipboardReadResult {
-    const wrapped = buildNamespaceWrappedCommand(
-      "osascript",
-      ["-l", "JavaScript", "-e", PUBLIC_PNG_SCRIPT],
-      context,
-      this.commandExists,
-    );
-    const result = this.commandRunner(wrapped.command, wrapped.args, {
-      environment: context.environment,
-      maxBuffer: MAX_BUFFER_BYTES,
-      timeout: READ_TIMEOUT_MS,
-    });
-
-    if (result.missingCommand) {
-      return { available: false, image: null };
-    }
-
-    if (!result.ok || result.stdout.length === 0) {
-      return { available: true, image: null };
-    }
-
-    return {
-      available: true,
-      image: {
-        bytes: new Uint8Array(result.stdout),
-        mimeType: "image/png",
-      },
-    };
-  }
-}
+import { buildNamespaceWrappedCommand, defaultCommandExists, type CommandExists } from "../shell-environment.js";
+import {
+  defaultCommandRunner,
+  MAX_BUFFER_BYTES,
+  READ_TIMEOUT_MS,
+  type CommandRunner,
+} from "./command-runner.js";
+import type { ClipboardImageProvider, ClipboardProviderContext, ClipboardReadResult } from "./types.js";
+
+const PUBLIC_PNG_SCRIPT = `ObjC.import('AppKit');
+const pasteboard = $.NSPasteboard.generalPasteboard;
+const data = pasteboard.dataForType('public.png');
+if (!data) {
+  $.exit(2);
+}
+$.NSFileHandle.fileHandleWithStandardOutput.writeData(data);`;
+
+export interface OsascriptPublicPngProviderOptions {
+  priority?: number;
+  commandRunner?: CommandRunner;
+  commandExists?: CommandExists;
+}
+
+export class OsascriptPublicPngProvider implements ClipboardImageProvider {
+  readonly capabilities;
+  private readonly commandRunner: CommandRunner;
+  private readonly commandExists: CommandExists;
+
+  constructor(options: OsascriptPublicPngProviderOptions = {}) {
+    this.capabilities = {
+      id: "mac-osascript-public-png",
+      name: "osascript public.png",
+      platforms: ["darwin"],
+      priority: options.priority ?? 20,
+    };
+    this.commandRunner = options.commandRunner ?? defaultCommandRunner;
+    this.commandExists = options.commandExists ?? defaultCommandExists;
+  }
+
+  isAvailable(context: ClipboardProviderContext): boolean {
+    try {
+      return this.commandExists("osascript", context);
+    } catch {
+      return false;
+    }
+  }
+
+  read(context: ClipboardProviderContext): ClipboardReadResult {
+    const wrapped = buildNamespaceWrappedCommand(
+      "osascript",
+      ["-l", "JavaScript", "-e", PUBLIC_PNG_SCRIPT],
+      context,
+      this.commandExists,
+    );
+    const result = this.commandRunner(wrapped.command, wrapped.args, {
+      environment: context.environment,
+      maxBuffer: MAX_BUFFER_BYTES,
+      timeout: READ_TIMEOUT_MS,
+    });
+
+    if (result.missingCommand) {
+      return { available: false, image: null };
+    }
+
+    if (!result.ok || result.stdout.length === 0) {
+      return { available: true, image: null };
+    }
+
+    return {
+      available: true,
+      image: {
+        bytes: new Uint8Array(result.stdout),
+        mimeType: "image/png",
+      },
+    };
+  }
+}