pi-fast-resume 1.0.1 → 1.1.0

package/README.md

@@ -107,9 +107,31 @@ Reload with `/reload` after any install method.
 
 ### Keyboard shortcut
 
-| Shortcut       | Action                      |
-| -------------- | --------------------------- |
-| `Ctrl+Shift+F` | Open the fast resume picker |
+There are two ways to bind a key to the fast resume picker:
+
+**Option 1: Rebind `app.session.resume`** (hijack mode only)
+
+In hijack mode (default), the fast picker replaces `/resume` — bind `app.session.resume` in `~/.pi/agent/keybindings.json`:
+
+```json
+{
+  "app.session.resume": "alt+u"
+}
+```
+
+**Option 2: Standalone shortcut** (works regardless of hijack mode)
+
+Set the `shortcut` key in `~/.pi/agent/extensions/pi-fast-resume.json`:
+
+```json
+{
+  "shortcut": "ctrl+shift+f"
+}
+```
+
+This registers an independent shortcut that opens the fast picker without overriding the built-in `/resume`. Works in both hijack and non-hijack modes.
+
+See [keybindings.md](https://github.com/earendil-works/pi-coding-agent/blob/main/docs/keybindings.md) for the key format and all available actions.
 
 ### Picker controls
 
@@ -184,17 +206,25 @@ However, pi-fast-resume can **prototype-patch** `InteractiveMode.showSessionSele
 - `/fast-resume` is not registered (no duplicate command)
 - `pi -r` / `pi --resume` are **not** affected (they run before the interactive mode starts)
 
-### Disable
+### Config options
+
+All options go in `~/.pi/agent/extensions/pi-fast-resume.json`:
+
+| Key | Type | Default | Description |
+| --- | ---- | ------- | ----------- |
+| `hijackResume` | `boolean` | `true` | When `true`, `/resume` and `app.session.resume` open the fast picker. Set `false` to use the built-in picker instead and keep `/fast-resume` as a separate command. |
+| `shortcut` | `string` | (none) | Register a standalone keybinding to open the fast picker. Works regardless of `hijackResume`. Example: `"ctrl+shift+f"` or `"alt+u"`.
 
-Create or edit `~/.pi/agent/extensions/pi-fast-resume.json`:
+Example:
 
 ```json
 {
-  "hijackResume": false
+  "hijackResume": false,
+  "shortcut": "alt+u"
 }
 ```
 
-Then reload with `/reload`. To re-enable, set `hijackResume` to `true` (or delete the key) and reload.
+Reload with `/reload` after changing config.
 
 ### How it works
 

package/fast-resume.ts

@@ -9,9 +9,11 @@
  *
  * Usage:
  *   /fast-resume [query]   Open fast session picker (current project scope)
- *   Ctrl+Shift+F           Open fast session picker via shortcut
  *
- * Hijack mode (on by default, opt-out via ~/.pi/agent/extensions/pi-fast-resume.json):
+ * Config (~/.pi/agent/extensions/pi-fast-resume.json):
+ *   { "hijackResume": false }
+ *
+ * Hijack mode (on by default, opt-out via config):
  *   { "hijackResume": false }
  *
  *   When enabled, /resume and Ctrl+Shift+R open the fast picker instead.
@@ -41,6 +43,7 @@
  */
 
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
+import type { KeyId } from "@earendil-works/pi-tui";
 import {
   DynamicBorder,
   InteractiveMode,
@@ -54,7 +57,6 @@ import {
   type Component,
   getKeybindings,
   Input,
-  Key,
   Spacer,
   Text,
   truncateToWidth,
@@ -92,10 +94,12 @@ import type { PickerScope } from "./src/picker-state.js";
 const HOME = homedir();
 
 // Config — read from ~/.pi/agent/extensions/pi-fast-resume.json
-// Example: { "hijackResume": false } to disable hijack
+// Example: { "hijackResume": false, "shortcut": "alt+u" }
 // By default hijackResume is true — /resume opens the fast picker
+// Set shortcut to register a standalone shortcut (e.g. "ctrl+shift+f")
 interface FastResumeConfig {
   hijackResume?: boolean;
+  shortcut?: string;
 }
 
 const CONFIG_PATH = join(HOME, ".pi", "agent", "extensions", "pi-fast-resume.json");
@@ -990,9 +994,52 @@ async function showFastResumePicker(
   }
 }
 
+// Stored reference to the extension runner, captured via prototype patch on
+// InteractiveMode.prototype.setupExtensionShortcuts. Used by the shortcut
+// handler to create an ExtensionCommandContext with switchSession(), since
+// pi.registerShortcut handlers only receive ExtensionContext.
+let storedExtensionRunner: any = null;
+
 // Reference to the original showSessionSelector, saved before patching
 let origShowSessionSelector: ((this: InteractiveMode) => void) | null = null;
 
+// Reference to the original setupExtensionShortcuts, saved before patching
+let origSetupExtensionShortcuts: Function | null = null;
+
+function patchSetupExtensionShortcuts(): void {
+  if (origSetupExtensionShortcuts !== null) return; // Already patched
+  const proto = InteractiveMode.prototype as any;
+  if (
+    !InteractiveMode ||
+    typeof InteractiveMode !== "function" ||
+    typeof proto.setupExtensionShortcuts !== "function"
+  ) {
+    return;
+  }
+  origSetupExtensionShortcuts = proto.setupExtensionShortcuts;
+  proto.setupExtensionShortcuts = function (
+    this: InteractiveMode,
+    extensionRunner: any,
+  ) {
+    storedExtensionRunner = extensionRunner;
+    origSetupExtensionShortcuts!.call(this, extensionRunner);
+  };
+}
+
+function unpatchSetupExtensionShortcuts(): void {
+  if (origSetupExtensionShortcuts === null) return;
+  const proto = InteractiveMode.prototype as any;
+  if (
+    InteractiveMode &&
+    typeof InteractiveMode === "function" &&
+    typeof proto.setupExtensionShortcuts === "function"
+  ) {
+    proto.setupExtensionShortcuts = origSetupExtensionShortcuts;
+  }
+  origSetupExtensionShortcuts = null;
+  storedExtensionRunner = null;
+}
+
 function installResumeHijack(): void {
   if (origShowSessionSelector !== null) return; // Already patched
   // eslint-disable-next-line @typescript-eslint/no-explicit-any -- prototype patching requires any cast for private access
@@ -1056,17 +1103,55 @@ export default function (pi: ExtensionAPI) {
     });
   }
 
-  pi.registerShortcut(Key.ctrlShift("f"), {
-    description: hijackResume ? "Open fast session resume (also /resume)" : "Open fast session resume picker",
-    handler: async (ctx) => {
-      await showFastResumePicker(ctx as unknown as ExtensionCommandContext);
-    },
-  });
+  // Register a standalone keyboard shortcut for the fast resume picker.
+  // pi.registerShortcut handlers receive ExtensionContext (no switchSession),
+  // so we capture the extension runner via a prototype patch on
+  // InteractiveMode.prototype.setupExtensionShortcuts and use it to create
+  // an ExtensionCommandContext inside the handler.
+  //
+  // Users can rebind the key via pi-fast-resume.json:
+  //   { "shortcut": "alt+u" }
+  //
+  // In hijack mode, app.session.resume also opens the fast picker (rebindable
+  // in ~/.pi/agent/keybindings.json). The shortcut config is an additional
+  // independent binding that does not override the built-in /resume.
+  const shortcut = config.shortcut;
+  if (shortcut) {
+    // Patch setupExtensionShortcuts so we can capture the extension runner.
+    // This runs before setupExtensionShortcuts is called (during extension
+    // load, which precedes the shortcut setup phase).
+    patchSetupExtensionShortcuts();
+
+    pi.registerShortcut(shortcut as KeyId, {
+      description: "Fast session resume",
+      handler: async (ctx) => {
+        // Use the stored extension runner to get a full command context
+        // with switchSession(), since the shortcut handler ctx (ExtensionContext)
+        // does not include session-switching methods.
+        if (
+          !storedExtensionRunner ||
+          typeof storedExtensionRunner.createCommandContext !== "function"
+        ) {
+          ctx.ui.notify(
+            "Fast resume shortcut: extension runner not available. Try reloading with /reload.",
+            "error",
+          );
+          return;
+        }
+        const cmdCtx =
+          storedExtensionRunner.createCommandContext() as ExtensionCommandContext;
+        await showFastResumePicker(cmdCtx);
+      },
+    });
+  }
 
-  // Clean up the prototype patch on session shutdown (reload, quit, session switch)
+  // Clean up prototype patches on session shutdown (reload, quit, session switch)
   pi.on("session_shutdown", () => {
     if (hijackResume) {
       uninstallResumeHijack();
     }
+    if (shortcut) {
+      unpatchSetupExtensionShortcuts();
+    }
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-fast-resume",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Fast session picker for pi — reads headers + first messages from 16KB partial reads instead of full-file parsing",
   "type": "module",
   "author": "Tom X Nguyen",