@blockrun/franklin 3.25.1 → 3.25.2

package/dist/ui/app.js

@@ -19,6 +19,7 @@ import { estimateCost } from '../pricing.js';
 import { formatTokens, shortModelName } from '../stats/format.js';
 import { mouse, forceDisableMouseTracking } from './mouse.js';
 import { resolveAskUserAnswer } from './ask-user-answer.js';
+import { looksLikeImagePasteStub } from './paste-heuristics.js';
 // ─── Full-width input box ──────────────────────────────────────────────────
 const BRACKETED_PASTE_START = '[200~';
 const BRACKETED_PASTE_END = '[201~';
@@ -445,53 +446,58 @@ function PromptTextInput({ value, onChange, onSubmit, placeholder = '', focus =
             const buffered = pasteBufferRef.current;
             pasteBufferRef.current = '';
             pasteActiveRef.current = false;
-            // Image-paste detection. Original heuristic (3.25.0) only probed the
-            // clipboard when the bracketed-paste buffer was empty, assuming Cmd+V
-            // on an image-only clipboard always arrived as an empty paste. That
-            // assumption holds for macOS Terminal/iTerm2 but NOT for several Linux
-            // terminals — some send a filename, a `file://` URI, or a short binary
-            // header alongside the image, which made the gate skip the probe and
-            // the image silently dropped (user-reported on Kali: the clipboard
-            // image was readable by other tools but Franklin couldn't paste it).
-            // Verified in a Lima Ubuntu VM with xclip — non-empty buffer triggered
-            // the skip.
-            //
-            // Fix: ALWAYS probe the clipboard on a paste-end. If an image is there,
-            // it wins; the bracketed-paste buffer text is treated as terminal noise
-            // and dropped. If no image, fall through to the normal text-paste path
-            // (collapse-to-block or inline) so text pastes are unaffected. The
-            // probe is async (osascript / xclip / wl-paste shell-out, 30-100 ms),
-            // so the handler returns immediately and updateValue happens when the
-            // Promise resolves.
+            // Image-paste detection. Cmd+V on a clipboard image arrives as an empty
+            // bracketed paste on macOS Terminal/iTerm2; several Linux terminals
+            // instead emit a filename, a `file://` URI, or the raw image header
+            // alongside it (3.25.0 only probed on an empty buffer, so those Linux
+            // shapes silently dropped the image — fixed in #77). We probe the system
+            // clipboard for an image only when the buffer *looks* like one of those
+            // stubs; genuine text is inserted synchronously below so the common
+            // paste path never waits on the async osascript / xclip / wl-paste
+            // shell-out (30-100 ms, but a cold spawn can be more).
             const insertAt = currentCursorOffset;
-            tryReadClipboardImage().then((img) => {
-                if (img && 'path' in img) {
-                    // Image wins — drop the bracketed-paste buffer (likely a stub the
-                    // terminal sent for the image).
-                    const injected = encodeImageBlock(img.path);
-                    const cur = valueRef.current;
-                    const at = Math.min(insertAt, cur.length);
-                    updateValue(cur.slice(0, at) + injected + cur.slice(at), at + injected.length);
+            const insertPastedText = (buf, baseOffset) => {
+                if (buf.length === 0)
                     return;
-                }
-                if (img && 'error' in img) {
-                    const injected = `[Image rejected: ${img.error}] `;
-                    const cur = valueRef.current;
-                    const at = Math.min(insertAt, cur.length);
-                    updateValue(cur.slice(0, at) + injected + cur.slice(at), at + injected.length);
-                    return;
-                }
-                // No image on the clipboard — treat as a normal text paste.
-                if (buffered.length === 0)
-                    return;
-                const lineCount = buffered.split('\n').length;
+                const lineCount = buf.split('\n').length;
                 const textToInsert = lineCount >= PASTE_COLLAPSE_LINE_THRESHOLD
-                    ? encodePasteBlock(buffered)
-                    : buffered;
+                    ? encodePasteBlock(buf)
+                    : buf;
                 const cur = valueRef.current;
-                const at = Math.min(insertAt, cur.length);
+                const at = Math.min(baseOffset, cur.length);
                 updateValue(cur.slice(0, at) + textToInsert + cur.slice(at), at + textToInsert.length);
-            }).catch(() => { });
+            };
+            if (looksLikeImagePasteStub(buffered)) {
+                // The probe is async; the handler returns now and updateValue happens
+                // when the Promise resolves. insertAt (captured above) pins the result
+                // to where the user pasted even if the cursor moved meanwhile.
+                tryReadClipboardImage().then((img) => {
+                    if (img && 'path' in img) {
+                        // Image wins — drop the bracketed-paste buffer (the terminal stub).
+                        const injected = encodeImageBlock(img.path);
+                        const cur = valueRef.current;
+                        const at = Math.min(insertAt, cur.length);
+                        updateValue(cur.slice(0, at) + injected + cur.slice(at), at + injected.length);
+                        return;
+                    }
+                    if (img && 'error' in img) {
+                        const injected = `[Image rejected: ${img.error}] `;
+                        const cur = valueRef.current;
+                        const at = Math.min(insertAt, cur.length);
+                        updateValue(cur.slice(0, at) + injected + cur.slice(at), at + injected.length);
+                        return;
+                    }
+                    // No image after all — the stub was literal text (e.g. a lone
+                    // "photo.png" the user actually typed). Insert it as text.
+                    insertPastedText(buffered, insertAt);
+                }).catch(() => {
+                    // Probe failed unexpectedly — don't lose the paste; insert as text.
+                    insertPastedText(buffered, insertAt);
+                });
+                return;
+            }
+            // Genuine text paste — insert synchronously, no clipboard probe.
+            insertPastedText(buffered, currentCursorOffset);
             return;
         }
         if (!text) {

package/dist/ui/paste-heuristics.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Pure heuristics for the bracketed-paste handler in app.tsx, split out so they
+ * can be unit-tested without pulling in Ink/React.
+ */
+/**
+ * Does a bracketed-paste buffer look like a terminal's stand-in for an image
+ * paste rather than genuine pasted text?
+ *
+ * Cmd+V on a clipboard image yields an *empty* buffer on macOS Terminal/iTerm2,
+ * but several Linux terminals instead emit a filename, a `file://` URI, or the
+ * raw image header alongside the paste. Those shapes — and only those — warrant
+ * the (async, 30-100 ms) clipboard probe in app.tsx. Substantial text returns
+ * `false` so it can be inserted synchronously, keeping the common paste path
+ * instant instead of waiting on an osascript / xclip / wl-paste shell-out.
+ *
+ * False positives are harmless: a literal text paste of "photo.png" probes the
+ * clipboard, finds no image, and falls through to the text path anyway.
+ */
+export declare function looksLikeImagePasteStub(buffered: string): boolean;

package/dist/ui/paste-heuristics.js

@@ -0,0 +1,40 @@
+/**
+ * Pure heuristics for the bracketed-paste handler in app.tsx, split out so they
+ * can be unit-tested without pulling in Ink/React.
+ */
+// Image filenames a terminal might substitute for a pasted image. Anchored, so
+// only a string that *is* such a path matches — not prose that mentions one.
+const IMAGE_FILE_EXT = /\.(png|jpe?g|gif|webp|bmp|tiff?|heic|heif|avif)$/i;
+/**
+ * Does a bracketed-paste buffer look like a terminal's stand-in for an image
+ * paste rather than genuine pasted text?
+ *
+ * Cmd+V on a clipboard image yields an *empty* buffer on macOS Terminal/iTerm2,
+ * but several Linux terminals instead emit a filename, a `file://` URI, or the
+ * raw image header alongside the paste. Those shapes — and only those — warrant
+ * the (async, 30-100 ms) clipboard probe in app.tsx. Substantial text returns
+ * `false` so it can be inserted synchronously, keeping the common paste path
+ * instant instead of waiting on an osascript / xclip / wl-paste shell-out.
+ *
+ * False positives are harmless: a literal text paste of "photo.png" probes the
+ * clipboard, finds no image, and falls through to the text path anyway.
+ */
+export function looksLikeImagePasteStub(buffered) {
+    // macOS image paste: empty / whitespace-only bracketed paste.
+    if (buffered.trim().length === 0)
+        return true;
+    // Raw binary the terminal dumped (e.g. PNG's \x1a, or bytes that failed
+    // UTF-8 decoding into U+FFFD). Genuine text never carries control chars
+    // other than tab / newline / carriage return.
+    if (/[\x00-\x08\x0b\x0c\x0e-\x1f�]/.test(buffered))
+        return true;
+    // A single-line file reference the terminal sent instead of the image bytes.
+    const trimmed = buffered.trim();
+    if (!trimmed.includes('\n')) {
+        if (/^file:\/\//i.test(trimmed))
+            return true; // file:// URI
+        if (IMAGE_FILE_EXT.test(trimmed))
+            return true; // bare filename / path
+    }
+    return false;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blockrun/franklin",
-  "version": "3.25.1",
+  "version": "3.25.2",
   "description": "Franklin Agent — The AI agent with a wallet. Spends USDC autonomously to get real work done. Pay per action, no subscriptions.",
   "type": "module",
   "exports": {