pi-orca-images 0.2.2 → 0.2.3

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.3
+
+- Fix: Pi crashed with "This extension ctx is stale after session replacement or reload" when an `[Image N]` label was in the prompt after `/resume`, `/new`, `/fork` or `/reload`. Pi hands extensions a Proxy over the TUI that ignores `delete`, so the old session's render hook was never removed and kept styling labels with its stale ctx.
+
 ## 0.2.2
 
 - Gallery: preview image (`pi.image`) and shorter description for the pi.dev package page.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-orca-images",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Inline images for Pi inside Orca's terminal, plus [Image N] paste labels.",
   "type": "module",
   "license": "MIT",

package/src/labels.ts

@@ -189,18 +189,24 @@ export interface EditorWatcher {
 /**
  * Label every editor in the TUI tree, checked before each render. Pi and extensions can swap the
  * editor at any time (custom editors, settings changes), so a one-time lookup is not enough.
+ *
+ * Pi hands extensions a Proxy over the TUI whose own-property checks and deletes never reach the
+ * TUI, so uninstall restores by assignment and the wrapper turns inert even if something else
+ * still holds it: a leftover wrapper would relabel editors with a stale session's style.
  */
 export function watchEditors(
 	tui: { doRender?: (...args: unknown[]) => unknown },
 	options: LabelOptions,
 ): EditorWatcher {
 	const installed = new Map<LabelTarget, ImageLabels>();
-	const hadOwn = Object.hasOwn(tui, "doRender");
 	const originalRender = tui.doRender;
+	let active = true;
 	if (originalRender) {
 		tui.doRender = function (this: unknown, ...args: unknown[]) {
-			for (const editor of findEditors(tui)) {
-				if (!installed.has(editor)) installed.set(editor, installImageLabels(editor, options));
+			if (active) {
+				for (const editor of findEditors(tui)) {
+					if (!installed.has(editor)) installed.set(editor, installImageLabels(editor, options));
+				}
 			}
 			return originalRender.apply(this, args);
 		};
@@ -210,11 +216,10 @@ export function watchEditors(
 			return installed.size;
 		},
 		uninstall() {
+			active = false;
 			for (const labels of installed.values()) labels.uninstall();
 			installed.clear();
-			if (!originalRender) return;
-			if (hadOwn) tui.doRender = originalRender;
-			else delete tui.doRender;
+			if (originalRender) tui.doRender = originalRender;
 		},
 	};
 }

package/src/shim.ts

@@ -85,7 +85,8 @@ export function installShim(tui: ShimTarget, options: ShimOptions = {}): Shim {
 			cancel();
 			if (shim.renderPatched) tui.doRender = originalRender;
 			if (shim.focusPatched) tui.handleViewportInput = originalInput;
-			delete host[SHIM];
+			// Assign, not delete: a delete through Pi's TUI Proxy never reaches the TUI.
+			host[SHIM] = undefined;
 		},
 	};