@psnext/slingcli 2.4.20260526-1 → 2.4.20260527-2

package/node_modules/@earendil-works/pi-coding-agent/dist/utils/image-resize.js

@@ -1,126 +1,86 @@
-import { applyExifOrientation } from "./exif-orientation.js";
-import { loadPhoton } from "./photon.js";
-// 4.5MB of base64 payload. Provides headroom below Anthropic's 5MB limit.
-const DEFAULT_MAX_BYTES = 4.5 * 1024 * 1024;
-const DEFAULT_OPTIONS = {
-    maxWidth: 2000,
-    maxHeight: 2000,
-    maxBytes: DEFAULT_MAX_BYTES,
-    jpegQuality: 80,
-};
-function encodeCandidate(buffer, mimeType) {
-    const data = Buffer.from(buffer).toString("base64");
-    return {
-        data,
-        encodedSize: Buffer.byteLength(data, "utf-8"),
-        mimeType,
-    };
+import { Worker } from "node:worker_threads";
+import { resizeImageInProcess } from "./image-resize-core.js";
+function toTransferableBytes(input) {
+    // Transfer detaches the buffer, so transfer a worker-owned copy and leave the
+    // caller's bytes intact.
+    return new Uint8Array(input);
 }
-/**
- * Resize an image to fit within the specified max dimensions and encoded file size.
- * Returns null if the image cannot be resized below maxBytes.
- *
- * Uses Photon (Rust/WASM) for image processing. If Photon is not available,
- * returns null.
- *
- * Strategy for staying under maxBytes:
- * 1. First resize to maxWidth/maxHeight
- * 2. Try both PNG and JPEG formats, pick the smaller one
- * 3. If still too large, try JPEG with decreasing quality
- * 4. If still too large, progressively reduce dimensions until 1x1
- */
-export async function resizeImage(img, options) {
-    const opts = { ...DEFAULT_OPTIONS, ...options };
-    const inputBuffer = Buffer.from(img.data, "base64");
-    const inputBase64Size = Buffer.byteLength(img.data, "utf-8");
-    const photon = await loadPhoton();
-    if (!photon) {
-        return null;
-    }
-    let image;
+function isResizeImageWorkerResponse(value) {
+    return value !== null && typeof value === "object";
+}
+function createResizeWorker(workerSpecifier) {
+    return new Worker(workerSpecifier);
+}
+async function resizeImageInWorker(workerSpecifier, inputBytes, mimeType, options) {
+    const worker = createResizeWorker(workerSpecifier);
     try {
-        const inputBytes = new Uint8Array(inputBuffer);
-        const rawImage = photon.PhotonImage.new_from_byteslice(inputBytes);
-        image = applyExifOrientation(photon, rawImage, inputBytes);
-        if (image !== rawImage)
-            rawImage.free();
-        const originalWidth = image.get_width();
-        const originalHeight = image.get_height();
-        const format = img.mimeType?.split("/")[1] ?? "png";
-        // Check if already within all limits (dimensions AND encoded size)
-        if (originalWidth <= opts.maxWidth && originalHeight <= opts.maxHeight && inputBase64Size < opts.maxBytes) {
-            return {
-                data: img.data,
-                mimeType: img.mimeType ?? `image/${format}`,
-                originalWidth,
-                originalHeight,
-                width: originalWidth,
-                height: originalHeight,
-                wasResized: false,
+        const inputBytesForWorker = toTransferableBytes(inputBytes);
+        return await new Promise((resolve, reject) => {
+            let settled = false;
+            const settle = (result) => {
+                if (settled)
+                    return;
+                settled = true;
+                resolve(result);
             };
-        }
-        // Calculate initial dimensions respecting max limits
-        let targetWidth = originalWidth;
-        let targetHeight = originalHeight;
-        if (targetWidth > opts.maxWidth) {
-            targetHeight = Math.round((targetHeight * opts.maxWidth) / targetWidth);
-            targetWidth = opts.maxWidth;
-        }
-        if (targetHeight > opts.maxHeight) {
-            targetWidth = Math.round((targetWidth * opts.maxHeight) / targetHeight);
-            targetHeight = opts.maxHeight;
-        }
-        function tryEncodings(width, height, jpegQualities) {
-            const resized = photon.resize(image, width, height, photon.SamplingFilter.Lanczos3);
-            try {
-                const candidates = [encodeCandidate(resized.get_bytes(), "image/png")];
-                for (const quality of jpegQualities) {
-                    candidates.push(encodeCandidate(resized.get_bytes_jpeg(quality), "image/jpeg"));
+            const fail = (error) => {
+                if (settled)
+                    return;
+                settled = true;
+                reject(error);
+            };
+            worker.once("message", (message) => {
+                if (!isResizeImageWorkerResponse(message)) {
+                    fail(new Error("Invalid image resize worker response"));
+                    return;
                 }
-                return candidates;
-            }
-            finally {
-                resized.free();
-            }
-        }
-        const qualitySteps = Array.from(new Set([opts.jpegQuality, 85, 70, 55, 40]));
-        let currentWidth = targetWidth;
-        let currentHeight = targetHeight;
-        while (true) {
-            const candidates = tryEncodings(currentWidth, currentHeight, qualitySteps);
-            for (const candidate of candidates) {
-                if (candidate.encodedSize < opts.maxBytes) {
-                    return {
-                        data: candidate.data,
-                        mimeType: candidate.mimeType,
-                        originalWidth,
-                        originalHeight,
-                        width: currentWidth,
-                        height: currentHeight,
-                        wasResized: true,
-                    };
+                if (message.error) {
+                    fail(new Error(message.error));
+                    return;
                 }
-            }
-            if (currentWidth === 1 && currentHeight === 1) {
-                break;
-            }
-            const nextWidth = currentWidth === 1 ? 1 : Math.max(1, Math.floor(currentWidth * 0.75));
-            const nextHeight = currentHeight === 1 ? 1 : Math.max(1, Math.floor(currentHeight * 0.75));
-            if (nextWidth === currentWidth && nextHeight === currentHeight) {
-                break;
-            }
-            currentWidth = nextWidth;
-            currentHeight = nextHeight;
-        }
-        return null;
-    }
-    catch {
-        return null;
+                settle(message.result ?? null);
+            });
+            worker.once("error", fail);
+            worker.once("exit", (code) => {
+                if (!settled) {
+                    fail(new Error(`Image resize worker exited with code ${code}`));
+                }
+            });
+            worker.postMessage({
+                inputBytes: inputBytesForWorker,
+                mimeType,
+                options,
+            }, [inputBytesForWorker.buffer]);
+        });
     }
     finally {
-        if (image) {
-            image.free();
+        void worker.terminate().catch(() => undefined);
+    }
+}
+/**
+ * Resize an image to fit within the specified max dimensions and encoded file size.
+ * Runs Photon in a worker thread so WASM decoding, resizing, and encoding do not
+ * block the TUI event loop. If the worker cannot be loaded (for example in some
+ * Bun compiled executable layouts), fall back to in-process resizing so image
+ * reads still work.
+ */
+export async function resizeImage(inputBytes, mimeType, options) {
+    const isTypeScriptRuntime = import.meta.url.endsWith(".ts");
+    const workerUrl = new URL(isTypeScriptRuntime ? "./image-resize-worker.ts" : "./image-resize-worker.js", import.meta.url);
+    // Bun compiled executables resolve worker entrypoints by string path, not via
+    // new URL(..., import.meta.url). Try the string path first under Bun so the
+    // release binary uses the embedded worker instead of falling back in-process.
+    if (typeof process.versions.bun === "string") {
+        try {
+            return await resizeImageInWorker("./src/utils/image-resize-worker.ts", inputBytes, mimeType, options);
         }
+        catch { }
+    }
+    try {
+        return await resizeImageInWorker(workerUrl, inputBytes, mimeType, options);
+    }
+    catch {
+        return resizeImageInProcess(inputBytes, mimeType, options);
     }
 }
 /**

package/node_modules/@earendil-works/pi-coding-agent/dist/utils/paths.js

@@ -1,6 +1,9 @@
 import { realpathSync } from "node:fs";
-import { isAbsolute, relative, resolve as resolvePath, sep } from "node:path";
+import { homedir } from "node:os";
+import { isAbsolute, join, resolve as nodeResolvePath, relative, sep } from "node:path";
+import { fileURLToPath } from "node:url";
 import { spawnProcessSync } from "./child-process.js";
+const UNICODE_SPACES = /[\u00A0\u2000-\u200A\u202F\u205F\u3000]/g;
 /**
  * Resolve a path to its canonical (real) form, following symlinks.
  * Falls back to the raw path if resolution fails (e.g. the target does
@@ -17,12 +20,12 @@ export function canonicalizePath(path) {
 }
 /**
  * Returns true if the value is NOT a package source (npm:, git:, etc.)
- * or a URL protocol. Bare names and relative paths without ./ prefix
+ * or a remote URL protocol. Bare names, relative paths, and file: URLs
  * are considered local.
  */
 export function isLocalPath(value) {
     const trimmed = value.trim();
-    // Known non-local prefixes
+    // Known non-local prefixes. file: URLs are local paths and are intentionally resolved by resolvePath().
     if (trimmed.startsWith("npm:") ||
         trimmed.startsWith("git:") ||
         trimmed.startsWith("github:") ||
@@ -33,19 +36,42 @@ export function isLocalPath(value) {
     }
     return true;
 }
-function resolveAgainstCwd(filePath, cwd) {
-    return isAbsolute(filePath) ? resolvePath(filePath) : resolvePath(cwd, filePath);
+export function normalizePath(input, options = {}) {
+    let normalized = options.trim ? input.trim() : input;
+    if (options.normalizeUnicodeSpaces) {
+        normalized = normalized.replace(UNICODE_SPACES, " ");
+    }
+    if (options.stripAtPrefix && normalized.startsWith("@")) {
+        normalized = normalized.slice(1);
+    }
+    if (options.expandTilde ?? true) {
+        const home = options.homeDir ?? homedir();
+        if (normalized === "~")
+            return home;
+        if (normalized.startsWith("~/") || (process.platform === "win32" && normalized.startsWith("~\\"))) {
+            return join(home, normalized.slice(2));
+        }
+    }
+    if (/^file:\/\//.test(normalized)) {
+        return fileURLToPath(normalized);
+    }
+    return normalized;
+}
+export function resolvePath(input, baseDir = process.cwd(), options = {}) {
+    const normalized = normalizePath(input, options);
+    const normalizedBaseDir = normalizePath(baseDir);
+    return isAbsolute(normalized) ? nodeResolvePath(normalized) : nodeResolvePath(normalizedBaseDir, normalized);
 }
 export function getCwdRelativePath(filePath, cwd) {
     const resolvedCwd = resolvePath(cwd);
-    const resolvedPath = resolveAgainstCwd(filePath, resolvedCwd);
+    const resolvedPath = resolvePath(filePath, resolvedCwd);
     const relativePath = relative(resolvedCwd, resolvedPath);
     const isInsideCwd = relativePath === "" ||
         (relativePath !== ".." && !relativePath.startsWith(`..${sep}`) && !isAbsolute(relativePath));
     return isInsideCwd ? relativePath || "." : undefined;
 }
 export function formatPathRelativeToCwdOrAbsolute(filePath, cwd) {
-    const absolutePath = resolveAgainstCwd(filePath, cwd);
+    const absolutePath = resolvePath(filePath, cwd);
     return (getCwdRelativePath(absolutePath, cwd) ?? absolutePath).split(sep).join("/");
 }
 export function markPathIgnoredByCloudSync(path) {

package/node_modules/@earendil-works/pi-coding-agent/npm-shrinkwrap.json

@@ -1,17 +1,17 @@
 {
 	"name": "@earendil-works/pi-coding-agent",
-	"version": "0.75.4",
+	"version": "0.75.5",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@earendil-works/pi-coding-agent",
-			"version": "0.75.4",
+			"version": "0.75.5",
 			"license": "MIT",
 			"dependencies": {
-				"@earendil-works/pi-agent-core": "^0.75.4",
-				"@earendil-works/pi-ai": "^0.75.4",
-				"@earendil-works/pi-tui": "^0.75.4",
+				"@earendil-works/pi-agent-core": "^0.75.5",
+				"@earendil-works/pi-ai": "^0.75.5",
+				"@earendil-works/pi-tui": "^0.75.5",
 				"@silvia-odwyer/photon-node": "0.3.4",
 				"chalk": "5.6.2",
 				"cross-spawn": "7.0.6",
@@ -473,11 +473,11 @@
 			}
 		},
 		"node_modules/@earendil-works/pi-agent-core": {
-			"version": "0.75.4",
-			"resolved": "https://registry.npmjs.org/@earendil-works/pi-agent-core/-/pi-agent-core-0.75.4.tgz",
+			"version": "0.75.5",
+			"resolved": "https://registry.npmjs.org/@earendil-works/pi-agent-core/-/pi-agent-core-0.75.5.tgz",
 			"license": "MIT",
 			"dependencies": {
-				"@earendil-works/pi-ai": "^0.75.4",
+				"@earendil-works/pi-ai": "^0.75.5",
 				"ignore": "7.0.5",
 				"typebox": "1.1.38",
 				"yaml": "2.9.0"
@@ -487,12 +487,13 @@
 			}
 		},
 		"node_modules/@earendil-works/pi-ai": {
-			"version": "0.75.4",
-			"resolved": "https://registry.npmjs.org/@earendil-works/pi-ai/-/pi-ai-0.75.4.tgz",
+			"version": "0.75.5",
+			"resolved": "https://registry.npmjs.org/@earendil-works/pi-ai/-/pi-ai-0.75.5.tgz",
 			"license": "MIT",
 			"dependencies": {
 				"@anthropic-ai/sdk": "0.91.1",
 				"@aws-sdk/client-bedrock-runtime": "3.1048.0",
+				"@smithy/node-http-handler": "4.7.3",
 				"@google/genai": "1.52.0",
 				"@mistralai/mistralai": "2.2.1",
 				"http-proxy-agent": "7.0.2",
@@ -509,16 +510,13 @@
 			}
 		},
 		"node_modules/@earendil-works/pi-tui": {
-			"version": "0.75.4",
-			"resolved": "https://registry.npmjs.org/@earendil-works/pi-tui/-/pi-tui-0.75.4.tgz",
+			"version": "0.75.5",
+			"resolved": "https://registry.npmjs.org/@earendil-works/pi-tui/-/pi-tui-0.75.5.tgz",
 			"license": "MIT",
 			"dependencies": {
 				"get-east-asian-width": "1.6.0",
 				"marked": "15.0.12"
 			},
-			"optionalDependencies": {
-				"koffi": "2.16.2"
-			},
 			"engines": {
 				"node": ">=22.19.0"
 			}
@@ -1369,17 +1367,6 @@
 				"safe-buffer": "^5.0.1"
 			}
 		},
-		"node_modules/koffi": {
-			"version": "2.16.2",
-			"resolved": "https://registry.npmjs.org/koffi/-/koffi-2.16.2.tgz",
-			"integrity": "sha512-owU0MRwv6xkrVqCd+33uw6BaYppkTRXbO/rVdJNI2dvZG0gzyRhYwW25eWtc5pauwK8TGh3AbkFONSezdykfSA==",
-			"license": "MIT",
-			"optional": true,
-			"hasInstallScript": true,
-			"funding": {
-				"url": "https://liberapay.com/Koromix"
-			}
-		},
 		"node_modules/long": {
 			"version": "5.3.2",
 			"resolved": "https://registry.npmjs.org/long/-/long-5.3.2.tgz",

package/node_modules/@earendil-works/pi-coding-agent/package.json

@@ -1,11 +1,11 @@
 {
 	"name": "@earendil-works/pi-coding-agent",
-	"version": "0.75.4",
+	"version": "0.75.5",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"piConfig": {
 		"configDir": ".sling",
-    "name": "sling"
+    "name":"sling"
 	},
 	"bin": {
 		"pi": "dist/cli.js"
@@ -32,7 +32,7 @@
 	"scripts": {
 		"clean": "shx rm -rf dist",
 		"build": "tsgo -p tsconfig.build.json && shx chmod +x dist/cli.js && npm run copy-assets",
-		"build:binary": "npm --prefix ../tui run build && npm --prefix ../ai run build && npm --prefix ../agent run build && npm run build && bun build --compile ./dist/bun/cli.js --outfile dist/pi && npm run copy-binary-assets",
+		"build:binary": "npm --prefix ../tui run build && npm --prefix ../ai run build && npm --prefix ../agent run build && npm run build && bun build --compile ./dist/bun/cli.js ./src/utils/image-resize-worker.ts --outfile dist/pi && npm run copy-binary-assets",
 		"copy-assets": "shx mkdir -p dist/modes/interactive/theme && shx cp src/modes/interactive/theme/*.json dist/modes/interactive/theme/ && shx mkdir -p dist/modes/interactive/assets && shx cp src/modes/interactive/assets/*.png dist/modes/interactive/assets/ && shx mkdir -p dist/core/export-html/vendor && shx cp src/core/export-html/template.html src/core/export-html/template.css src/core/export-html/template.js dist/core/export-html/ && shx cp src/core/export-html/vendor/*.js dist/core/export-html/vendor/",
 		"copy-binary-assets": "shx cp package.json dist/ && shx cp README.md dist/ && shx cp CHANGELOG.md dist/ && shx mkdir -p dist/theme && shx cp src/modes/interactive/theme/*.json dist/theme/ && shx mkdir -p dist/assets && shx cp src/modes/interactive/assets/*.png dist/assets/ && shx mkdir -p dist/export-html/vendor && shx cp src/core/export-html/template.html dist/export-html/ && shx cp src/core/export-html/vendor/*.js dist/export-html/vendor/ && shx cp -r docs dist/ && shx cp -r examples dist/ && shx cp ../../node_modules/@silvia-odwyer/photon-node/photon_rs_bg.wasm dist/",
 		"test": "vitest --run",
@@ -40,9 +40,9 @@
 		"prepublishOnly": "npm run clean && npm run build && npm run shrinkwrap"
 	},
 	"dependencies": {
-		"@earendil-works/pi-agent-core": "^0.75.4",
-		"@earendil-works/pi-ai": "^0.75.4",
-		"@earendil-works/pi-tui": "^0.75.4",
+		"@earendil-works/pi-agent-core": "^0.75.5",
+		"@earendil-works/pi-ai": "^0.75.5",
+		"@earendil-works/pi-tui": "^0.75.5",
 		"@silvia-odwyer/photon-node": "0.3.4",
 		"chalk": "5.6.2",
 		"cross-spawn": "7.0.6",

package/node_modules/@earendil-works/pi-tui/dist/components/editor.js

@@ -3,9 +3,10 @@ import { decodePrintableKey, matchesKey } from "../keys.js";
 import { KillRing } from "../kill-ring.js";
 import { CURSOR_MARKER } from "../tui.js";
 import { UndoStack } from "../undo-stack.js";
-import { getSegmenter, isPunctuationChar, isWhitespaceChar, truncateToWidth, visibleWidth } from "../utils.js";
+import { getGraphemeSegmenter, getWordSegmenter, isWhitespaceChar, truncateToWidth, visibleWidth } from "../utils.js";
 import { SelectList } from "./select-list.js";
-const baseSegmenter = getSegmenter();
+const graphemeSegmenter = getGraphemeSegmenter();
+const wordSegmenter = getWordSegmenter();
 /** Regex matching paste markers like `[paste #1 +123 lines]` or `[paste #2 1234 chars]`. */
 const PASTE_MARKER_REGEX = /\[paste #(\d+)( (\+\d+ lines|\d+ chars))?\]/g;
 /** Non-global version for single-segment testing. */
@@ -21,7 +22,7 @@ function isPasteMarker(segment) {
  *
  * Only markers whose numeric ID exists in `validIds` are merged.
  */
-function segmentWithMarkers(text, validIds) {
+function segmentWithMarkers(text, baseSegmenter, validIds) {
     // Fast path: no paste markers in the text or no valid IDs.
     if (validIds.size === 0 || !text.includes("[paste #")) {
         return baseSegmenter.segment(text);
@@ -86,7 +87,7 @@ export function wordWrapLine(line, maxWidth, preSegmented) {
         return [{ text: line, startIndex: 0, endIndex: line.length }];
     }
     const chunks = [];
-    const segments = preSegmented ?? [...baseSegmenter.segment(line)];
+    const segments = preSegmented ?? [...graphemeSegmenter.segment(line)];
     let currentWidth = 0;
     let chunkStart = 0;
     // Wrap opportunity: the position after the last whitespace before a non-whitespace
@@ -225,8 +226,8 @@ export class Editor {
         return new Set(this.pastes.keys());
     }
     /** Segment text with paste-marker awareness, only merging markers with valid IDs. */
-    segment(text) {
-        return segmentWithMarkers(text, this.validPasteIds());
+    segment(text, mode) {
+        return segmentWithMarkers(text, mode === "word" ? wordSegmenter : graphemeSegmenter, this.validPasteIds());
     }
     getPaddingX() {
         return this.paddingX;
@@ -381,7 +382,7 @@ export class Editor {
                 if (after.length > 0) {
                     // Cursor is on a character (grapheme) - replace it with highlighted version
                     // Get the first grapheme from 'after'
-                    const afterGraphemes = [...this.segment(after)];
+                    const afterGraphemes = [...this.segment(after, "grapheme")];
                     const firstGrapheme = afterGraphemes[0]?.segment || "";
                     const restAfter = after.slice(firstGrapheme.length);
                     const cursor = `\x1b[7m${firstGrapheme}\x1b[0m`;
@@ -717,7 +718,7 @@ export class Editor {
             }
             else {
                 // Line needs wrapping - use word-aware wrapping
-                const chunks = wordWrapLine(line, contentWidth, [...this.segment(line)]);
+                const chunks = wordWrapLine(line, contentWidth, [...this.segment(line, "grapheme")]);
                 for (let chunkIndex = 0; chunkIndex < chunks.length; chunkIndex++) {
                     const chunk = chunks[chunkIndex];
                     if (!chunk)
@@ -1030,7 +1031,7 @@ export class Editor {
             const line = this.state.lines[this.state.cursorLine] || "";
             const beforeCursor = line.slice(0, this.state.cursorCol);
             // Find the last grapheme in the text before cursor
-            const graphemes = [...this.segment(beforeCursor)];
+            const graphemes = [...this.segment(beforeCursor, "grapheme")];
             const lastGrapheme = graphemes[graphemes.length - 1];
             const graphemeLength = lastGrapheme ? lastGrapheme.segment.length : 1;
             const before = line.slice(0, this.state.cursorCol - graphemeLength);
@@ -1114,7 +1115,7 @@ export class Editor {
         // Snap cursor to atomic segment boundary (e.g. paste markers)
         // so the cursor never lands in the middle of a multi-grapheme unit.
         // Single-grapheme segments don't need snapping.
-        const segments = [...this.segment(logicalLine)];
+        const segments = [...this.segment(logicalLine, "grapheme")];
         for (const seg of segments) {
             if (seg.index > this.state.cursorCol)
                 break;
@@ -1334,7 +1335,7 @@ export class Editor {
             // Delete grapheme at cursor position (handles emojis, combining characters, etc.)
             const afterCursor = currentLine.slice(this.state.cursorCol);
             // Find the first grapheme at cursor
-            const graphemes = [...this.segment(afterCursor)];
+            const graphemes = [...this.segment(afterCursor, "grapheme")];
             const firstGrapheme = graphemes[0];
             const graphemeLength = firstGrapheme ? firstGrapheme.segment.length : 1;
             const before = currentLine.slice(0, this.state.cursorCol);
@@ -1389,7 +1390,7 @@ export class Editor {
             }
             else {
                 // Line needs wrapping - use word-aware wrapping
-                const chunks = wordWrapLine(line, width, [...this.segment(line)]);
+                const chunks = wordWrapLine(line, width, [...this.segment(line, "grapheme")]);
                 for (const chunk of chunks) {
                     visualLines.push({
                         logicalLine: i,
@@ -1441,7 +1442,7 @@ export class Editor {
                 // Moving right - move by one grapheme (handles emojis, combining characters, etc.)
                 if (this.state.cursorCol < currentLine.length) {
                     const afterCursor = currentLine.slice(this.state.cursorCol);
-                    const graphemes = [...this.segment(afterCursor)];
+                    const graphemes = [...this.segment(afterCursor, "grapheme")];
                     const firstGrapheme = graphemes[0];
                     this.setCursorCol(this.state.cursorCol + (firstGrapheme ? firstGrapheme.segment.length : 1));
                 }
@@ -1462,7 +1463,7 @@ export class Editor {
                 // Moving left - move by one grapheme (handles emojis, combining characters, etc.)
                 if (this.state.cursorCol > 0) {
                     const beforeCursor = currentLine.slice(0, this.state.cursorCol);
-                    const graphemes = [...this.segment(beforeCursor)];
+                    const graphemes = [...this.segment(beforeCursor, "grapheme")];
                     const lastGrapheme = graphemes[graphemes.length - 1];
                     this.setCursorCol(this.state.cursorCol - (lastGrapheme ? lastGrapheme.segment.length : 1));
                 }
@@ -1501,35 +1502,27 @@ export class Editor {
             return;
         }
         const textBeforeCursor = currentLine.slice(0, this.state.cursorCol);
-        const graphemes = [...this.segment(textBeforeCursor)];
+        const segments = [...this.segment(textBeforeCursor, "word")];
         let newCol = this.state.cursorCol;
         // Skip trailing whitespace
-        while (graphemes.length > 0 &&
-            !isPasteMarker(graphemes[graphemes.length - 1]?.segment || "") &&
-            isWhitespaceChar(graphemes[graphemes.length - 1]?.segment || "")) {
-            newCol -= graphemes.pop()?.segment.length || 0;
-        }
-        if (graphemes.length > 0) {
-            const lastGrapheme = graphemes[graphemes.length - 1]?.segment || "";
-            if (isPasteMarker(lastGrapheme)) {
-                // Paste marker is a single atomic word
-                newCol -= graphemes.pop()?.segment.length || 0;
-            }
-            else if (isPunctuationChar(lastGrapheme)) {
-                // Skip punctuation run
-                while (graphemes.length > 0 &&
-                    isPunctuationChar(graphemes[graphemes.length - 1]?.segment || "") &&
-                    !isPasteMarker(graphemes[graphemes.length - 1]?.segment || "")) {
-                    newCol -= graphemes.pop()?.segment.length || 0;
-                }
+        while (segments.length > 0 &&
+            !isPasteMarker(segments[segments.length - 1]?.segment || "") &&
+            isWhitespaceChar(segments[segments.length - 1]?.segment || "")) {
+            newCol -= segments.pop()?.segment.length || 0;
+        }
+        if (segments.length > 0) {
+            const last = segments[segments.length - 1];
+            if (isPasteMarker(last.segment) || last.isWordLike) {
+                // Skip one word-like segment (or paste marker)
+                newCol -= segments.pop()?.segment.length || 0;
             }
             else {
-                // Skip word run
-                while (graphemes.length > 0 &&
-                    !isWhitespaceChar(graphemes[graphemes.length - 1]?.segment || "") &&
-                    !isPunctuationChar(graphemes[graphemes.length - 1]?.segment || "") &&
-                    !isPasteMarker(graphemes[graphemes.length - 1]?.segment || "")) {
-                    newCol -= graphemes.pop()?.segment.length || 0;
+                // Skip non-word non-whitespace run (punctuation)
+                while (segments.length > 0 &&
+                    !isPasteMarker(segments[segments.length - 1]?.segment || "") &&
+                    !segments[segments.length - 1]?.isWordLike &&
+                    !isWhitespaceChar(segments[segments.length - 1]?.segment || "")) {
+                    newCol -= segments.pop()?.segment.length || 0;
                 }
             }
         }
@@ -1691,7 +1684,7 @@ export class Editor {
             return;
         }
         const textAfterCursor = currentLine.slice(this.state.cursorCol);
-        const segments = this.segment(textAfterCursor);
+        const segments = this.segment(textAfterCursor, "word");
         const iterator = segments[Symbol.iterator]();
         let next = iterator.next();
         let newCol = this.state.cursorCol;
@@ -1701,24 +1694,16 @@ export class Editor {
             next = iterator.next();
         }
         if (!next.done) {
-            const firstGrapheme = next.value.segment;
-            if (isPasteMarker(firstGrapheme)) {
-                // Paste marker is a single atomic word
-                newCol += firstGrapheme.length;
-            }
-            else if (isPunctuationChar(firstGrapheme)) {
-                // Skip punctuation run
-                while (!next.done && isPunctuationChar(next.value.segment) && !isPasteMarker(next.value.segment)) {
-                    newCol += next.value.segment.length;
-                    next = iterator.next();
-                }
+            if (isPasteMarker(next.value.segment) || next.value.isWordLike) {
+                // Skip one word-like segment (or paste marker)
+                newCol += next.value.segment.length;
             }
             else {
-                // Skip word run
+                // Skip non-word non-whitespace run (punctuation)
                 while (!next.done &&
-                    !isWhitespaceChar(next.value.segment) &&
-                    !isPunctuationChar(next.value.segment) &&
-                    !isPasteMarker(next.value.segment)) {
+                    !isPasteMarker(next.value.segment) &&
+                    !next.value.isWordLike &&
+                    !isWhitespaceChar(next.value.segment)) {
                     newCol += next.value.segment.length;
                     next = iterator.next();
                 }

package/node_modules/@earendil-works/pi-tui/dist/components/input.js

@@ -3,8 +3,8 @@ import { decodeKittyPrintable } from "../keys.js";
 import { KillRing } from "../kill-ring.js";
 import { CURSOR_MARKER } from "../tui.js";
 import { UndoStack } from "../undo-stack.js";
-import { getSegmenter, isPunctuationChar, isWhitespaceChar, sliceByColumn, visibleWidth } from "../utils.js";
-const segmenter = getSegmenter();
+import { getGraphemeSegmenter, isPunctuationChar, isWhitespaceChar, sliceByColumn, visibleWidth } from "../utils.js";
+const segmenter = getGraphemeSegmenter();
 /**
  * Input component - single-line text input with horizontal scrolling
  */