pi-edit-session-in-place 0.1.15 → 0.1.17

package/CHANGELOG.md

@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## [0.1.17] - 2026-06-04
+
+### Fixed
+- fixed the editor hotkey command dispatch when duplicate installs suffix the command as `/edit-turn:1`, `/edit-turn:2`, etc.
+- removed the local project package setting accidentally left by release verification so the repo no longer loads a duplicate project copy during local reloads
+
+## [0.1.16] - 2026-06-04
+
+### Fixed
+- fixed `Ctrl+Shift+E` after the Pi 0.78.1 update by removing the registered shortcut handler that consumed the key and only showed the placeholder notification
+- added regression coverage that verifies the extension no longer registers a conflicting shortcut handler and still installs the custom editor hotkey path
+
+### Changed
+- removed the custom main-editor wrapper path and returned to the focused custom-editor hotkey path used by the working releases
+
 ## [0.1.15] - 2026-06-04
 
 ### Changed

package/README.md

@@ -81,7 +81,7 @@ If you clear the message and submit an empty value, the selected message is effe
 - If the selected message contains images, the extension warns that re-editing or deleting it will drop the images and keep only text behavior
 - The extension only offers text-bearing user messages for editing; image-only or whitespace-only user messages are skipped
 - Queued messages must be cleared before using the command
-- If another extension has already customized the main editor, this extension wraps it instead of replacing it
+- The `Ctrl+Shift+E` hotkey is handled by this extension's main-editor component so Pi's registered shortcut dispatcher does not consume it first
 
 ## Development
 

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

@@ -15,7 +15,6 @@ import {
 	DynamicBorder,
 	keyHint,
 	rawKeyHint,
-	type AppKeybinding,
 	type ExtensionAPI,
 	type ExtensionCommandContext,
 	type KeybindingsManager,
@@ -30,8 +29,6 @@ import {
 	Spacer,
 	Text,
 	matchesKey,
-	type AutocompleteProvider,
-	type EditorComponent,
 	type EditorTheme,
 	type Focusable,
 	type TUI,
@@ -572,166 +569,32 @@ const handleEditTurn = async (ctx: ExtensionCommandContext) => {
 	);
 };
 
-const triggerEditTurnCommand = (editor: Pick<EditorComponent, "getText" | "setText" | "handleInput">) => {
-	draftBeforeHotkey = editor.getText();
-	editor.setText(COMMAND_TEXT);
-	editor.handleInput("\r");
+export const getEditTurnCommandText = (commands: Array<{ name: string }>) => {
+	const candidates = commands
+		.map((command) => command.name)
+		.filter((name) => name === COMMAND_NAME || name.startsWith(`${COMMAND_NAME}:`));
+	return `/${candidates.at(-1) ?? COMMAND_NAME}`;
 };
 
 class EditSessionInPlaceEditor extends CustomEditor {
-	handleInput(data: string): void {
-		if (matchesKey(data, HOTKEY)) {
-			triggerEditTurnCommand(this);
-			return;
-		}
-
-		super.handleInput(data);
-	}
-}
-
-type AutocompleteAwareEditor = EditorComponent & {
-	isShowingAutocomplete?: () => boolean;
-};
-
-class EditSessionInPlaceEditorWrapper implements EditorComponent, Focusable {
-	public actionHandlers: Map<AppKeybinding, () => void> = new Map();
-	public onEscape?: () => void;
-	public onCtrlD?: () => void;
-	public onPasteImage?: () => void;
-	public onExtensionShortcut?: (data: string) => boolean | undefined;
-
 	constructor(
-		private readonly base: EditorComponent,
-		private readonly keybindings: KeybindingsManager,
-	) {}
-
-	get focused(): boolean {
-		return "focused" in this.base && typeof this.base.focused === "boolean" ? this.base.focused : false;
-	}
-
-	set focused(value: boolean) {
-		if ("focused" in this.base) {
-			(this.base as EditorComponent & Focusable).focused = value;
-		}
-	}
-
-	get wantsKeyRelease(): boolean | undefined {
-		return this.base.wantsKeyRelease;
-	}
-
-	set wantsKeyRelease(value: boolean | undefined) {
-		this.base.wantsKeyRelease = value;
-	}
-
-	get onSubmit(): ((text: string) => void) | undefined {
-		return this.base.onSubmit;
-	}
-
-	set onSubmit(value: ((text: string) => void) | undefined) {
-		this.base.onSubmit = value;
-	}
-
-	get onChange(): ((text: string) => void) | undefined {
-		return this.base.onChange;
-	}
-
-	set onChange(value: ((text: string) => void) | undefined) {
-		this.base.onChange = value;
-	}
-
-	get borderColor(): ((str: string) => string) | undefined {
-		return this.base.borderColor;
-	}
-
-	set borderColor(value: ((str: string) => string) | undefined) {
-		this.base.borderColor = value;
-	}
-
-	render(width: number): string[] {
-		return this.base.render(width);
-	}
-
-	invalidate(): void {
-		this.base.invalidate();
-	}
-
-	getText(): string {
-		return this.base.getText();
-	}
-
-	setText(text: string): void {
-		this.base.setText(text);
+		tui: TUI,
+		theme: EditorTheme,
+		keybindings: KeybindingsManager,
+		private readonly getCommandText: () => string,
+	) {
+		super(tui, theme, keybindings);
 	}
 
 	handleInput(data: string): void {
 		if (matchesKey(data, HOTKEY)) {
-			triggerEditTurnCommand(this.base);
-			return;
-		}
-
-		if (this.onExtensionShortcut?.(data)) {
+			draftBeforeHotkey = this.getText();
+			this.setText(this.getCommandText());
+			super.handleInput("\r");
 			return;
 		}
 
-		if (this.keybindings.matches(data, "app.clipboard.pasteImage")) {
-			this.onPasteImage?.();
-			return;
-		}
-
-		if (this.keybindings.matches(data, "app.interrupt")) {
-			const isShowingAutocomplete = (this.base as AutocompleteAwareEditor).isShowingAutocomplete?.() ?? false;
-			if (!isShowingAutocomplete) {
-				const handler = this.onEscape ?? this.actionHandlers.get("app.interrupt");
-				if (handler) {
-					handler();
-					return;
-				}
-			}
-
-			this.base.handleInput(data);
-			return;
-		}
-
-		if (this.keybindings.matches(data, "app.exit") && this.base.getText().length === 0) {
-			const handler = this.onCtrlD ?? this.actionHandlers.get("app.exit");
-			if (handler) {
-				handler();
-			}
-			return;
-		}
-
-		for (const [action, handler] of this.actionHandlers) {
-			if (action !== "app.interrupt" && action !== "app.exit" && this.keybindings.matches(data, action)) {
-				handler();
-				return;
-			}
-		}
-
-		this.base.handleInput(data);
-	}
-
-	addToHistory(text: string): void {
-		this.base.addToHistory?.(text);
-	}
-
-	insertTextAtCursor(text: string): void {
-		this.base.insertTextAtCursor?.(text);
-	}
-
-	getExpandedText(): string {
-		return this.base.getExpandedText?.() ?? this.base.getText();
-	}
-
-	setAutocompleteProvider(provider: AutocompleteProvider): void {
-		this.base.setAutocompleteProvider?.(provider);
-	}
-
-	setPaddingX(padding: number): void {
-		this.base.setPaddingX?.(padding);
-	}
-
-	setAutocompleteMaxVisible(maxVisible: number): void {
-		this.base.setAutocompleteMaxVisible?.(maxVisible);
+		super.handleInput(data);
 	}
 }
 
@@ -743,27 +606,12 @@ export default function editSessionInPlace(pi: ExtensionAPI) {
 		},
 	});
 
-	// Shortcut handlers receive ExtensionContext, so the custom editor hotkey path performs
-	// the command execution while this registration keeps the hotkey discoverable.
-	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", (_event, ctx) => {
 		clearSavedDraft();
 		if (ctx.mode === "tui") {
-			const previousEditor = ctx.ui.getEditorComponent();
-			ctx.ui.setEditorComponent((tui, theme, keybindings) => {
-				const baseEditor = previousEditor?.(tui, theme, keybindings);
-				return baseEditor ? new EditSessionInPlaceEditorWrapper(baseEditor, keybindings) : new EditSessionInPlaceEditor(tui, theme, keybindings);
-			});
+			ctx.ui.setEditorComponent((tui, theme, keybindings) =>
+				new EditSessionInPlaceEditor(tui, theme, keybindings, () => getEditTurnCommandText(pi.getCommands())),
+			);
 		}
 	});
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-edit-session-in-place",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "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",