@draht/coding-agent 2026.3.6 → 2026.3.11-1

package/dist/modes/interactive/interactive-mode.js

@@ -360,6 +360,12 @@ export class InteractiveMode {
                 this.showNewVersionNotification(newVersion);
             }
         });
+        // Check tmux keyboard setup asynchronously
+        this.checkTmuxKeyboardSetup().then((warning) => {
+            if (warning) {
+                this.showWarning(warning);
+            }
+        });
         // Show startup warnings
         const { migratedProviders, modelFallbackMessage, initialMessage, initialImages, initialMessages } = this.options;
         if (migratedProviders && migratedProviders.length > 0) {
@@ -428,6 +434,44 @@ export class InteractiveMode {
             return undefined;
         }
     }
+    async checkTmuxKeyboardSetup() {
+        if (!process.env.TMUX)
+            return undefined;
+        const runTmuxShow = (option) => {
+            return new Promise((resolve) => {
+                const proc = spawn("tmux", ["show", "-gv", option], {
+                    stdio: ["ignore", "pipe", "ignore"],
+                });
+                let stdout = "";
+                const timer = setTimeout(() => {
+                    proc.kill();
+                    resolve(undefined);
+                }, 2000);
+                proc.stdout?.on("data", (data) => {
+                    stdout += data.toString();
+                });
+                proc.on("error", () => {
+                    clearTimeout(timer);
+                    resolve(undefined);
+                });
+                proc.on("close", (code) => {
+                    clearTimeout(timer);
+                    resolve(code === 0 ? stdout.trim() : undefined);
+                });
+            });
+        };
+        const [extendedKeys, extendedKeysFormat] = await Promise.all([
+            runTmuxShow("extended-keys"),
+            runTmuxShow("extended-keys-format"),
+        ]);
+        if (extendedKeys !== "on" && extendedKeys !== "always") {
+            return "tmux extended-keys is off. Modified Enter keys may not work. Add `set -g extended-keys on` to ~/.tmux.conf and restart tmux.";
+        }
+        if (extendedKeysFormat === "xterm") {
+            return "tmux extended-keys-format is xterm. Pi works best with csi-u. Add `set -g extended-keys-format csi-u` to ~/.tmux.conf and restart tmux.";
+        }
+        return undefined;
+    }
     /**
      * Get changelog entries to display on startup.
      * Only shows new entries since last seen version, skips for resumed sessions.
@@ -1289,10 +1333,18 @@ export class InteractiveMode {
             // Use duck typing since instanceof fails across jiti module boundaries
             const customEditor = newEditor;
             if ("actionHandlers" in customEditor && customEditor.actionHandlers instanceof Map) {
-                customEditor.onEscape = () => this.defaultEditor.onEscape?.();
-                customEditor.onCtrlD = () => this.defaultEditor.onCtrlD?.();
-                customEditor.onPasteImage = () => this.defaultEditor.onPasteImage?.();
-                customEditor.onExtensionShortcut = (data) => this.defaultEditor.onExtensionShortcut?.(data);
+                if (!customEditor.onEscape) {
+                    customEditor.onEscape = () => this.defaultEditor.onEscape?.();
+                }
+                if (!customEditor.onCtrlD) {
+                    customEditor.onCtrlD = () => this.defaultEditor.onCtrlD?.();
+                }
+                if (!customEditor.onPasteImage) {
+                    customEditor.onPasteImage = () => this.defaultEditor.onPasteImage?.();
+                }
+                if (!customEditor.onExtensionShortcut) {
+                    customEditor.onExtensionShortcut = (data) => this.defaultEditor.onExtensionShortcut?.(data);
+                }
                 // Copy action handlers (clear, suspend, model switching, etc.)
                 for (const [action, handler] of this.defaultEditor.actionHandlers) {
                     customEditor.actionHandlers.set(action, handler);
@@ -2294,6 +2346,7 @@ export class InteractiveMode {
             // Spawn editor synchronously with inherited stdio for interactive editing
             const result = spawnSync(editor, [...editorArgs, tmpFile], {
                 stdio: "inherit",
+                shell: process.platform === "win32",
             });
             // On successful exit (status 0), replace editor content
             if (result.status === 0) {
@@ -2547,6 +2600,7 @@ export class InteractiveMode {
                 hideThinkingBlock: this.hideThinkingBlock,
                 collapseChangelog: this.settingsManager.getCollapseChangelog(),
                 doubleEscapeAction: this.settingsManager.getDoubleEscapeAction(),
+                treeFilterMode: this.settingsManager.getTreeFilterMode(),
                 showHardwareCursor: this.settingsManager.getShowHardwareCursor(),
                 editorPaddingX: this.settingsManager.getEditorPaddingX(),
                 autocompleteMaxVisible: this.settingsManager.getAutocompleteMaxVisible(),
@@ -2625,6 +2679,9 @@ export class InteractiveMode {
                 onDoubleEscapeActionChange: (action) => {
                     this.settingsManager.setDoubleEscapeAction(action);
                 },
+                onTreeFilterModeChange: (mode) => {
+                    this.settingsManager.setTreeFilterMode(mode);
+                },
                 onShowHardwareCursorChange: (enabled) => {
                     this.settingsManager.setShowHardwareCursor(enabled);
                     this.ui.setShowHardwareCursor(enabled);
@@ -2878,6 +2935,7 @@ export class InteractiveMode {
     showTreeSelector(initialSelectedId) {
         const tree = this.sessionManager.getTree();
         const realLeafId = this.sessionManager.getLeafId();
+        const initialFilterMode = this.settingsManager.getTreeFilterMode();
         if (tree.length === 0) {
             this.showStatus("No entries in session");
             return;
@@ -2971,7 +3029,7 @@ export class InteractiveMode {
             }, (entryId, label) => {
                 this.sessionManager.appendLabelChange(entryId, label);
                 this.ui.requestRender();
-            }, initialSelectedId);
+            }, initialSelectedId, initialFilterMode);
             return { component: selector, focus: selector };
         });
     }
@@ -3526,6 +3584,7 @@ export class InteractiveMode {
         // New session via session (emits extension session events)
         await this.session.newSession();
         // Clear UI state
+        this.headerContainer.clear();
         this.chatContainer.clear();
         this.pendingMessagesContainer.clear();
         this.compactionQueuedMessages = [];