pi-edit-session-in-place 0.1.0 → 0.1.1

package/README.md

@@ -2,6 +2,16 @@
 
 A [pi](https://github.com/badlogic/pi-mono) extension that lets you rewind to an earlier user message in the current branch, then either **edit it in place** or **delete it and continue from there**.
 
+## Compatibility
+
+Tested with:
+
+- `@mariozechner/pi-coding-agent` `0.65.2`
+- `@mariozechner/pi-tui` `0.65.2`
+- Node.js `>=20.6.0`
+
+The package follows current pi packaging guidance and publishes pi core packages as peer dependencies with `"*"`, while local development and verification in this repo target pi `0.65.2`.
+
 ## What it does
 
 - Adds `/edit-turn`
@@ -31,12 +41,6 @@ Then reload pi from inside the app with:
 /reload
 ```
 
-For local development you can point pi at the extension directly:
-
-```bash
-pi -e ./extensions/edit-session-in-place.ts
-```
-
 ## Usage
 
 Inside pi:
@@ -80,18 +84,35 @@ If you clear the message and submit an empty value, the selected message is effe
 
 ## Development
 
-This repo includes a small regression test in:
+For local development you can point pi at the extension directly:
+
+```bash
+pi -e ./extensions/edit-session-in-place.ts
+```
+
+Local verification:
+
+```bash
+npm run verify
+```
+
+That runs:
 
-- `tests/edit-session-in-place.test.ts`
+- `npm test` — compiles the TypeScript test fixtures to `.test-dist/` and runs them with Node's built-in test runner
+- `npm run typecheck` — strict TypeScript type-checking
+- `npm pack --dry-run` — publishability check for the npm package contents
 
-Checks:
+Current regression coverage in `tests/edit-session-in-place.test.ts` includes:
 
 - message extraction from mixed session content
 - oldest-to-newest ordering for the picker
 - skipping image-only and whitespace-only user messages
 - preserving the image-warning flag for mixed text+image messages
+- `$VISUAL`/`$EDITOR` resolution rules
+- external editor command parsing with quoting/escaping
+- trimming exactly one trailing newline from external-editor output
 
 ## Files
 
 - `extensions/edit-session-in-place.ts` — publishable extension implementation
-- `tests/edit-session-in-place.test.ts` — regression test for message extraction and ordering
+- `tests/edit-session-in-place.test.ts` — regression tests for message extraction, ordering, and external-editor helpers

package/extensions/edit-session-in-place.ts

@@ -24,6 +24,7 @@ import {
 import {
 	Container,
 	Editor,
+	Key,
 	SelectList,
 	Spacer,
 	Text,
@@ -33,7 +34,8 @@ import {
 	type TUI,
 } from "@mariozechner/pi-tui";
 
-const HOTKEY = "ctrl+shift+e";
+const HOTKEY = Key.ctrlShift("e");
+const HOTKEY_LABEL = "Ctrl+Shift+E";
 const CLEAR_ALL_KEY = "ctrl+x";
 const COMMAND_NAME = "edit-turn";
 const COMMAND_TEXT = `/${COMMAND_NAME}`;
@@ -42,6 +44,8 @@ const EDIT_TITLE = "Edit previous user message";
 const PREVIEW_MAX_LENGTH = 90;
 const SELECTOR_MAX_VISIBLE = 12;
 const SELECTOR_PAGE_STEP = SELECTOR_MAX_VISIBLE - 1;
+const EXTERNAL_EDITOR_TMP_PREFIX = "pi-reedit-message-";
+const EXTERNAL_EDITOR_FILE_NAME = "message.md";
 
 type TextContentBlock = {
 	type?: string;
@@ -59,6 +63,11 @@ export type EditableUserMessage = {
 	label: string;
 };
 
+export type ExternalEditorCommand = {
+	executable: string;
+	args: string[];
+};
+
 let draftBeforeHotkey: string | undefined;
 
 const clamp = (value: number, min: number, max: number) => Math.max(min, Math.min(value, max));
@@ -80,6 +89,114 @@ const createEditorTheme = (theme: Theme): EditorTheme => ({
 	},
 });
 
+export const resolveExternalEditorCommand = (env: NodeJS.ProcessEnv) => {
+	const visual = env.VISUAL?.trim();
+	if (visual) {
+		return visual;
+	}
+
+	const editor = env.EDITOR?.trim();
+	return editor || undefined;
+};
+
+export const parseExternalEditorCommand = (command: string): ExternalEditorCommand => {
+	const parts: string[] = [];
+	let current = "";
+	let quote: "'" | '"' | undefined;
+	let tokenStarted = false;
+
+	const pushCurrent = () => {
+		if (!tokenStarted) {
+			return;
+		}
+
+		parts.push(current);
+		current = "";
+		tokenStarted = false;
+	};
+
+	for (let index = 0; index < command.length; index += 1) {
+		const character = command[index];
+		if (!character) {
+			continue;
+		}
+
+		if (quote === "'") {
+			if (character === "'") {
+				quote = undefined;
+			} else {
+				current += character;
+			}
+			tokenStarted = true;
+			continue;
+		}
+
+		if (quote === '"') {
+			if (character === '"') {
+				quote = undefined;
+				continue;
+			}
+
+			if (character === "\\") {
+				const next = command[index + 1];
+				if (next && ['"', "\\", "$", "`"].includes(next)) {
+					current += next;
+					index += 1;
+				} else {
+					current += character;
+				}
+				tokenStarted = true;
+				continue;
+			}
+
+			current += character;
+			tokenStarted = true;
+			continue;
+		}
+
+		if (/\s/.test(character)) {
+			pushCurrent();
+			continue;
+		}
+
+		if (character === "'" || character === '"') {
+			quote = character;
+			tokenStarted = true;
+			continue;
+		}
+
+		if (character === "\\") {
+			const next = command[index + 1];
+			if (next && /[\s'"\\]/.test(next)) {
+				current += next;
+				index += 1;
+			} else {
+				current += character;
+			}
+			tokenStarted = true;
+			continue;
+		}
+
+		current += character;
+		tokenStarted = true;
+	}
+
+	if (quote) {
+		throw new Error("Unterminated quote in $VISUAL/$EDITOR.");
+	}
+
+	pushCurrent();
+
+	const [executable, ...args] = parts;
+	if (!executable) {
+		throw new Error("External editor command is empty.");
+	}
+
+	return { executable, args };
+};
+
+export const trimSingleTrailingNewline = (text: string) => text.replace(/\r?\n$/, "");
+
 export const extractEditableText = (content: unknown): { text: string | undefined; hasImages: boolean } => {
 	if (typeof content === "string") {
 		const text = content.trim();
@@ -285,7 +402,7 @@ class ReeditMessageEditor extends Container implements Focusable {
 		this.addChild(this.editor);
 		this.addChild(new Spacer(1));
 
-		const hasExternalEditor = Boolean(process.env.VISUAL || process.env.EDITOR);
+		const hasExternalEditor = Boolean(resolveExternalEditorCommand(process.env));
 		const hint = [
 			keyHint("tui.select.confirm", "submit"),
 			keyHint("tui.input.newLine", "newline"),
@@ -320,38 +437,45 @@ class ReeditMessageEditor extends Container implements Focusable {
 	}
 
 	private openExternalEditor() {
-		const editorCmd = process.env.VISUAL || process.env.EDITOR;
-		if (!editorCmd) {
+		const editorCommand = resolveExternalEditorCommand(process.env);
+		if (!editorCommand) {
 			return;
 		}
 
 		const currentText = this.editor.getText();
-		const tmpFile = path.join(os.tmpdir(), `pi-reedit-message-${Date.now()}.md`);
+		let parsedCommand: ExternalEditorCommand;
+		try {
+			parsedCommand = parseExternalEditorCommand(editorCommand);
+		} catch {
+			return;
+		}
+
+		const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), EXTERNAL_EDITOR_TMP_PREFIX));
+		const tempFile = path.join(tempDir, EXTERNAL_EDITOR_FILE_NAME);
+		let nextText: string | undefined;
 
 		try {
-			fs.writeFileSync(tmpFile, currentText, "utf-8");
+			fs.writeFileSync(tempFile, currentText, { encoding: "utf-8", flag: "wx", mode: 0o600 });
 			this.tui.stop();
 
-			const [editor, ...editorArgs] = editorCmd.split(" ");
-			const result = spawnSync(editor, [...editorArgs, tmpFile], {
+			const result = spawnSync(parsedCommand.executable, [...parsedCommand.args, tempFile], {
 				stdio: "inherit",
 				shell: process.platform === "win32",
 			});
 
-			if (result.status === 0) {
-				const newContent = fs.readFileSync(tmpFile, "utf-8").replace(/\n$/, "");
-				this.editor.setText(newContent);
+			if (result.status === 0 && !result.error) {
+				nextText = trimSingleTrailingNewline(fs.readFileSync(tempFile, "utf-8"));
 			}
 		} finally {
-			try {
-				fs.unlinkSync(tmpFile);
-			} catch {
-				// Ignore cleanup errors.
-			}
-
+			fs.rmSync(tempDir, { recursive: true, force: true });
 			this.tui.start();
 			this.tui.requestRender(true);
 		}
+
+		if (nextText !== undefined) {
+			this.editor.setText(nextText);
+			this.tui.requestRender();
+		}
 	}
 }
 
@@ -457,12 +581,26 @@ class EditSessionInPlaceEditor extends CustomEditor {
 
 export default function editSessionInPlace(pi: ExtensionAPI) {
 	pi.registerCommand(COMMAND_NAME, {
-		description: `Select and re-edit a previous user message on the current branch (${HOTKEY})`,
+		description: `Select and re-edit a previous user message on the current branch (${HOTKEY_LABEL})`,
 		handler: async (_args, ctx) => {
 			await handleEditTurn(ctx);
 		},
 	});
 
+	// pi 0.65.2 shortcut handlers receive ExtensionContext, which cannot run slash commands
+	// or navigate the session tree. Keep the custom editor hotkey path for execution, and
+	// register the shortcut here so it appears in /hotkeys and other shortcut diagnostics.
+	pi.registerShortcut(HOTKEY, {
+		description: `Edit a previous user message (${HOTKEY_LABEL})`,
+		handler: (ctx) => {
+			if (!ctx.hasUI) {
+				return;
+			}
+
+			ctx.ui.notify(`Press ${HOTKEY_LABEL} in the main editor to edit a previous message.`, "info");
+		},
+	});
+
 	pi.on("session_start", async () => {
 		clearSavedDraft();
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-edit-session-in-place",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "pi extension that lets you re-edit or delete an earlier user message in the current session branch",
   "author": "Mitch Fultz (https://github.com/fitchmultz)",
   "license": "MIT",
@@ -23,10 +23,13 @@
   },
   "homepage": "https://github.com/fitchmultz/pi-edit-session-in-place#readme",
   "scripts": {
-    "test": "node --experimental-strip-types tests/edit-session-in-place.test.ts",
-    "typecheck": "tsc --noEmit",
-    "check": "npm test && npm run typecheck",
-    "prepublishOnly": "npm run check && npm pack --dry-run"
+    "clean:test": "node -e \"require('node:fs').rmSync('.test-dist', { recursive: true, force: true })\"",
+    "build:test": "npm run clean:test && tsc -p tsconfig.test.json",
+    "test": "npm run build:test && node --test .test-dist/tests/*.test.js",
+    "typecheck": "tsc --noEmit -p tsconfig.json",
+    "check": "npm run verify",
+    "verify": "npm test && npm run typecheck && npm pack --dry-run",
+    "prepublishOnly": "npm run verify"
   },
   "files": [
     "extensions",
@@ -37,12 +40,18 @@
     "@mariozechner/pi-coding-agent": "*",
     "@mariozechner/pi-tui": "*"
   },
+  "engines": {
+    "node": ">=20.6.0"
+  },
   "devDependencies": {
     "@mariozechner/pi-coding-agent": "^0.65.2",
     "@mariozechner/pi-tui": "^0.65.2",
     "@types/node": "^24.6.0",
     "typescript": "^5.9.3"
   },
+  "overrides": {
+    "basic-ftp": "5.2.2"
+  },
   "pi": {
     "extensions": [
       "./extensions"