pi-double-esc 1.0.16 → 1.0.18

package/README.md

@@ -104,7 +104,7 @@ MIT
 
 ## Pi 1.0 compatibility (1.0.16)
 
-Tested against Pi **1.0.0** with exact SDK development pins and wildcard host peers.
+Tested against Pi **1.2.0** with exact SDK development pins and wildcard host peers.
 Editor composition, autocomplete Escape, timer cleanup and shutdown restoration remain intact.
 
 Run `bun run test:host` for the offline real-host regression. Set `PI1_HOST_PACKAGE` to an installed Pi package directory and `PI1_HOST_ENTRY=bundle` to test its bundled CLI runtime.

package/double-esc.ts

@@ -134,24 +134,53 @@ function decorateDoubleEscapeEditor(
 const DECORATED_FACTORY = Symbol("pi-double-esc.decoratedFactory");
 
 type EditorFactory = NonNullable<ReturnType<ExtensionContext["ui"]["getEditorComponent"]>>;
-type DecoratedEditorFactory = EditorFactory & { [DECORATED_FACTORY]?: true };
+// Shared with cooperating editor decorators: inactive factories are skipped
+// when an outer owner later unwinds, regardless of shutdown order.
+const EDITOR_FACTORY_PATCH = Symbol.for("pi.editor-factory.patch.v1");
+type DecoratedEditorFactory = EditorFactory & {
+  [DECORATED_FACTORY]?: true;
+  [EDITOR_FACTORY_PATCH]?: { active: boolean; original?: EditorFactory };
+};
+function unwrapEditorFactory(factory: EditorFactory | undefined): EditorFactory | undefined {
+  while (factory) {
+    const state = (factory as DecoratedEditorFactory)[EDITOR_FACTORY_PATCH];
+    if (!state || state.active) return factory;
+    factory = state.original;
+  }
+  return undefined;
+}
+
+function hasDoubleEscape(factory: EditorFactory | undefined): boolean {
+  while (factory) {
+    const wrapped = factory as DecoratedEditorFactory;
+    const state = wrapped[EDITOR_FACTORY_PATCH];
+    if (state?.active !== false && wrapped[DECORATED_FACTORY]) return true;
+    factory = state?.original;
+  }
+  return false;
+}
 
 export default function (pi: ExtensionAPI) {
   const cleanups = new Set<() => void>();
   let installed: DecoratedEditorFactory | undefined;
   let previous: EditorFactory | undefined;
+  const factoryStates: { active: boolean; original?: EditorFactory }[] = [];
   pi.on("session_start", (_event, ctx) => {
     if (ctx.mode !== "tui") return;
-    const previousEditorFactory = ctx.ui.getEditorComponent() as DecoratedEditorFactory | undefined;
-    if (previousEditorFactory?.[DECORATED_FACTORY]) return;
+    const previousEditorFactory = unwrapEditorFactory(ctx.ui.getEditorComponent()) as DecoratedEditorFactory | undefined;
+    if (hasDoubleEscape(previousEditorFactory)) return;
 
+    const state = { active: true, original: previousEditorFactory };
     const editorFactory: DecoratedEditorFactory = (tui, editorTheme, keybindings) => {
       const editor =
-        previousEditorFactory?.(tui, editorTheme, keybindings) ??
+        unwrapEditorFactory(previousEditorFactory)?.(tui, editorTheme, keybindings) ??
         new CustomEditor(tui, editorTheme, keybindings);
+      if (!state.active) return editor;
       return decorateDoubleEscapeEditor(editor, tui, ctx.ui.theme, () => ctx.isIdle(), (cleanup) => cleanups.add(cleanup));
     };
     editorFactory[DECORATED_FACTORY] = true;
+    editorFactory[EDITOR_FACTORY_PATCH] = state;
+    factoryStates.push(state);
 
     previous = previousEditorFactory;
     installed = editorFactory;
@@ -160,7 +189,9 @@ export default function (pi: ExtensionAPI) {
   pi.on("session_shutdown", (_event, ctx) => {
     for (const cleanup of cleanups) cleanup();
     cleanups.clear();
-    if (installed && ctx.ui.getEditorComponent() === installed) ctx.ui.setEditorComponent(previous);
+    for (const state of factoryStates) state.active = false;
+    factoryStates.length = 0;
+    if (installed && ctx.ui.getEditorComponent() === installed) ctx.ui.setEditorComponent(unwrapEditorFactory(previous));
     installed = undefined;
     previous = undefined;
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-double-esc",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "Prevent accidental Escape from aborting the LLM — requires double-press to interrupt while streaming",
   "type": "module",
   "author": "Tom X Nguyen",
@@ -38,8 +38,8 @@
     "lint:dead": "knip --no-gitignore"
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "1.0.0",
-    "@earendil-works/pi-tui": "1.0.0",
+    "@earendil-works/pi-coding-agent": "1.2.0",
+    "@earendil-works/pi-tui": "1.2.0",
     "@types/node": "25.9.1",
     "@vitest/coverage-v8": "4.1.7",
     "knip": "6.14.1",
@@ -52,7 +52,7 @@
     ]
   },
   "overrides": {
-    "brace-expansion": "5.0.6"
+    "brace-expansion": "5.0.12"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "*",