@phi-code-admin/phi-code 0.74.2 → 0.75.0

package/dist/modes/interactive/components/session-selector.js

@@ -2,11 +2,12 @@ import { spawnSync } from "node:child_process";
 import { existsSync } from "node:fs";
 import { unlink } from "node:fs/promises";
 import * as os from "node:os";
-import { Container, getEditorKeybindings, Input, matchesKey, Spacer, Text, truncateToWidth, visibleWidth, } from "phi-code-tui";
+import { Container, getKeybindings, Input, Spacer, Text, truncateToWidth, visibleWidth, } from "phi-code-tui";
 import { KeybindingsManager } from "../../../core/keybindings.js";
+import { canonicalizePath as _canonicalizePath } from "../../../utils/paths.js";
 import { theme } from "../theme/theme.js";
 import { DynamicBorder } from "./dynamic-border.js";
-import { appKey, appKeyHint, keyHint } from "./keybinding-hints.js";
+import { keyHint, keyText } from "./keybinding-hints.js";
 import { filterAndSortSessions, hasSessionName } from "./session-selector-search.js";
 function shortenPath(path) {
     const home = os.homedir();
@@ -37,19 +38,27 @@ function formatSessionDate(date) {
         return `${Math.floor(diffDays / 30)}mo`;
     return `${Math.floor(diffDays / 365)}y`;
 }
+function canonicalizePath(path) {
+    if (!path)
+        return path;
+    return _canonicalizePath(path);
+}
 class SessionSelectorHeader {
-    constructor(scope, sortMode, nameFilter, keybindings, requestRender) {
-        this.loading = false;
-        this.loadProgress = null;
-        this.showPath = false;
-        this.confirmingDeletePath = null;
-        this.statusMessage = null;
-        this.statusTimeout = null;
-        this.showRenameHint = false;
+    scope;
+    sortMode;
+    nameFilter;
+    requestRender;
+    loading = false;
+    loadProgress = null;
+    showPath = false;
+    confirmingDeletePath = null;
+    statusMessage = null;
+    statusTimeout = null;
+    showRenameHint = false;
+    constructor(scope, sortMode, nameFilter, requestRender) {
         this.scope = scope;
         this.sortMode = sortMode;
         this.nameFilter = nameFilter;
-        this.keybindings = keybindings;
         this.requestRender = requestRender;
     }
     setScope(scope) {
@@ -122,7 +131,7 @@ class SessionSelectorHeader {
         let hintLine1;
         let hintLine2;
         if (this.confirmingDeletePath !== null) {
-            const confirmHint = "Delete session? [Enter] confirm · [Esc/Ctrl+C] cancel";
+            const confirmHint = `Delete session? ${keyHint("tui.select.confirm", "confirm")} · ${keyHint("tui.select.cancel", "cancel")}`;
             hintLine1 = theme.fg("error", truncateToWidth(confirmHint, width, "…"));
             hintLine2 = "";
         }
@@ -134,15 +143,15 @@ class SessionSelectorHeader {
         else {
             const pathState = this.showPath ? "(on)" : "(off)";
             const sep = theme.fg("muted", " · ");
-            const hint1 = keyHint("tab", "scope") + sep + theme.fg("muted", 're:<pattern> regex · "phrase" exact');
+            const hint1 = keyHint("tui.input.tab", "scope") + sep + theme.fg("muted", 're:<pattern> regex · "phrase" exact');
             const hint2Parts = [
-                keyHint("toggleSessionSort", "sort"),
-                appKeyHint(this.keybindings, "toggleSessionNamedFilter", "named"),
-                keyHint("deleteSession", "delete"),
-                keyHint("toggleSessionPath", `path ${pathState}`),
+                keyHint("app.session.toggleSort", "sort"),
+                keyHint("app.session.toggleNamedFilter", "named"),
+                keyHint("app.session.delete", "delete"),
+                keyHint("app.session.togglePath", `path ${pathState}`),
             ];
             if (this.showRenameHint) {
-                hint2Parts.push(keyHint("renameSession", "rename"));
+                hint2Parts.push(keyHint("app.session.rename", "rename"));
             }
             const hint2 = hint2Parts.join(sep);
             hintLine1 = truncateToWidth(hint1, width, "…");
@@ -158,12 +167,14 @@ class SessionSelectorHeader {
 function buildSessionTree(sessions) {
     const byPath = new Map();
     for (const session of sessions) {
-        byPath.set(session.path, { session, children: [] });
+        const sessionPath = canonicalizePath(session.path) ?? session.path;
+        byPath.set(sessionPath, { session, children: [] });
     }
     const roots = [];
     for (const session of sessions) {
-        const node = byPath.get(session.path);
-        const parentPath = session.parentSessionPath;
+        const sessionPath = canonicalizePath(session.path) ?? session.path;
+        const node = byPath.get(sessionPath);
+        const parentPath = canonicalizePath(session.parentSessionPath);
         if (parentPath && byPath.has(parentPath)) {
             byPath.get(parentPath).children.push(node);
         }
@@ -208,6 +219,31 @@ class SessionList {
         const selected = this.filteredSessions[this.selectedIndex];
         return selected?.session.path;
     }
+    allSessions = [];
+    filteredSessions = [];
+    selectedIndex = 0;
+    searchInput;
+    showCwd = false;
+    sortMode = "threaded";
+    nameFilter = "all";
+    keybindings;
+    showPath = false;
+    confirmingDeletePath = null;
+    currentSessionCanonicalPath;
+    onSelect;
+    onCancel;
+    onExit = () => { };
+    onToggleScope;
+    onToggleSort;
+    onToggleNameFilter;
+    onTogglePath;
+    onDeleteConfirmationChange;
+    onDeleteSession;
+    onRenameSession;
+    onError;
+    maxVisible = 10; // Max sessions visible (one line each)
+    // Focusable implementation - propagate to searchInput for IME cursor positioning
+    _focused = false;
     get focused() {
         return this._focused;
     }
@@ -216,18 +252,6 @@ class SessionList {
         this.searchInput.focused = value;
     }
     constructor(sessions, showCwd, sortMode, nameFilter, keybindings, currentSessionFilePath) {
-        this.allSessions = [];
-        this.filteredSessions = [];
-        this.selectedIndex = 0;
-        this.showCwd = false;
-        this.sortMode = "threaded";
-        this.nameFilter = "all";
-        this.showPath = false;
-        this.confirmingDeletePath = null;
-        this.onExit = () => { };
-        this.maxVisible = 10; // Max sessions visible (one line each)
-        // Focusable implementation - propagate to searchInput for IME cursor positioning
-        this._focused = false;
         this.allSessions = sessions;
         this.filteredSessions = [];
         this.searchInput = new Input();
@@ -235,7 +259,7 @@ class SessionList {
         this.sortMode = sortMode;
         this.nameFilter = nameFilter;
         this.keybindings = keybindings;
-        this.currentSessionFilePath = currentSessionFilePath;
+        this.currentSessionCanonicalPath = canonicalizePath(currentSessionFilePath);
         this.filterSessions("");
         // Handle Enter in search input - select current item
         this.searchInput.onSubmit = () => {
@@ -289,12 +313,17 @@ class SessionList {
         if (!selected)
             return;
         // Prevent deleting current session
-        if (this.currentSessionFilePath && selected.session.path === this.currentSessionFilePath) {
+        if (this.isCurrentSessionPath(selected.session.path)) {
             this.onError?.("Cannot delete the currently active session");
             return;
         }
         this.setConfirmingDeletePath(selected.session.path);
     }
+    isCurrentSessionPath(path) {
+        if (!this.currentSessionCanonicalPath)
+            return false;
+        return (canonicalizePath(path) ?? path) === this.currentSessionCanonicalPath;
+    }
     invalidate() { }
     render(width) {
         const lines = [];
@@ -304,7 +333,7 @@ class SessionList {
         if (this.filteredSessions.length === 0) {
             let emptyMessage;
             if (this.nameFilter === "named") {
-                const toggleKey = appKey(this.keybindings, "toggleSessionNamedFilter");
+                const toggleKey = keyText("app.session.toggleNamedFilter");
                 if (this.showCwd) {
                     emptyMessage = `  No named sessions found. Press ${toggleKey} to show all.`;
                 }
@@ -332,7 +361,7 @@ class SessionList {
             const session = node.session;
             const isSelected = i === this.selectedIndex;
             const isConfirmingDelete = session.path === this.confirmingDeletePath;
-            const isCurrent = this.currentSessionFilePath === session.path;
+            const isCurrent = this.isCurrentSessionPath(session.path);
             // Build tree prefix
             const prefix = this.buildTreePrefix(node);
             // Session display text (name or first message)
@@ -399,50 +428,49 @@ class SessionList {
         return parts.join("") + branch;
     }
     handleInput(keyData) {
-        const kb = getEditorKeybindings();
+        const kb = getKeybindings();
         // Handle delete confirmation state first - intercept all keys
         if (this.confirmingDeletePath !== null) {
-            if (kb.matches(keyData, "selectConfirm")) {
+            if (kb.matches(keyData, "tui.select.confirm")) {
                 const pathToDelete = this.confirmingDeletePath;
                 this.setConfirmingDeletePath(null);
                 void this.onDeleteSession?.(pathToDelete);
                 return;
             }
-            // Allow both Escape and Ctrl+C to cancel (consistent with pi UX)
-            if (kb.matches(keyData, "selectCancel") || matchesKey(keyData, "ctrl+c")) {
+            if (kb.matches(keyData, "tui.select.cancel")) {
                 this.setConfirmingDeletePath(null);
                 return;
             }
             // Ignore all other keys while confirming
             return;
         }
-        if (kb.matches(keyData, "tab")) {
+        if (kb.matches(keyData, "tui.input.tab")) {
             if (this.onToggleScope) {
                 this.onToggleScope();
             }
             return;
         }
-        if (kb.matches(keyData, "toggleSessionSort")) {
+        if (kb.matches(keyData, "app.session.toggleSort")) {
             this.onToggleSort?.();
             return;
         }
-        if (this.keybindings.matches(keyData, "toggleSessionNamedFilter")) {
+        if (this.keybindings.matches(keyData, "app.session.toggleNamedFilter")) {
             this.onToggleNameFilter?.();
             return;
         }
         // Ctrl+P: toggle path display
-        if (kb.matches(keyData, "toggleSessionPath")) {
+        if (kb.matches(keyData, "app.session.togglePath")) {
             this.showPath = !this.showPath;
             this.onTogglePath?.(this.showPath);
             return;
         }
         // Ctrl+D: initiate delete confirmation (useful on terminals that don't distinguish Ctrl+Backspace from Backspace)
-        if (kb.matches(keyData, "deleteSession")) {
+        if (kb.matches(keyData, "app.session.delete")) {
             this.startDeleteConfirmationForSelectedSession();
             return;
         }
-        // Ctrl+R: rename selected session
-        if (matchesKey(keyData, "ctrl+r")) {
+        // Rename selected session
+        if (kb.matches(keyData, "app.session.rename")) {
             const selected = this.filteredSessions[this.selectedIndex];
             if (selected) {
                 this.onRenameSession?.(selected.session.path);
@@ -451,7 +479,7 @@ class SessionList {
         }
         // Ctrl+Backspace: non-invasive convenience alias for delete
         // Only triggers deletion when the query is empty; otherwise it is forwarded to the input
-        if (kb.matches(keyData, "deleteSessionNoninvasive")) {
+        if (kb.matches(keyData, "app.session.deleteNoninvasive")) {
             if (this.searchInput.getValue().length > 0) {
                 this.searchInput.handleInput(keyData);
                 this.filterSessions(this.searchInput.getValue());
@@ -461,30 +489,30 @@ class SessionList {
             return;
         }
         // Up arrow
-        if (kb.matches(keyData, "selectUp")) {
+        if (kb.matches(keyData, "tui.select.up")) {
             this.selectedIndex = Math.max(0, this.selectedIndex - 1);
         }
         // Down arrow
-        else if (kb.matches(keyData, "selectDown")) {
+        else if (kb.matches(keyData, "tui.select.down")) {
             this.selectedIndex = Math.min(this.filteredSessions.length - 1, this.selectedIndex + 1);
         }
         // Page up - jump up by maxVisible items
-        else if (kb.matches(keyData, "selectPageUp")) {
+        else if (kb.matches(keyData, "tui.select.pageUp")) {
             this.selectedIndex = Math.max(0, this.selectedIndex - this.maxVisible);
         }
         // Page down - jump down by maxVisible items
-        else if (kb.matches(keyData, "selectPageDown")) {
+        else if (kb.matches(keyData, "tui.select.pageDown")) {
             this.selectedIndex = Math.min(this.filteredSessions.length - 1, this.selectedIndex + this.maxVisible);
         }
         // Enter
-        else if (kb.matches(keyData, "selectConfirm")) {
+        else if (kb.matches(keyData, "tui.select.confirm")) {
             const selected = this.filteredSessions[this.selectedIndex];
             if (selected && this.onSelect) {
                 this.onSelect(selected.session.path);
             }
         }
         // Escape - cancel
-        else if (kb.matches(keyData, "selectCancel")) {
+        else if (kb.matches(keyData, "tui.select.cancel")) {
             if (this.onCancel) {
                 this.onCancel();
             }
@@ -538,8 +566,8 @@ async function deleteSessionFile(sessionPath) {
 export class SessionSelectorComponent extends Container {
     handleInput(data) {
         if (this.mode === "rename") {
-            const kb = getEditorKeybindings();
-            if (kb.matches(data, "selectCancel") || matchesKey(data, "ctrl+c")) {
+            const kb = getKeybindings();
+            if (kb.matches(data, "tui.select.cancel")) {
                 this.exitRenameMode();
                 return;
             }
@@ -548,6 +576,28 @@ export class SessionSelectorComponent extends Container {
         }
         this.sessionList.handleInput(data);
     }
+    canRename = true;
+    sessionList;
+    header;
+    keybindings;
+    scope = "current";
+    sortMode = "threaded";
+    nameFilter = "all";
+    currentSessions = null;
+    allSessions = null;
+    currentSessionsLoader;
+    allSessionsLoader;
+    onCancel;
+    requestRender;
+    renameSession;
+    currentLoading = false;
+    allLoading = false;
+    allLoadSeq = 0;
+    mode = "list";
+    renameInput = new Input();
+    renameTargetPath = null;
+    // Focusable implementation - propagate to sessionList for IME cursor positioning
+    _focused = false;
     get focused() {
         return this._focused;
     }
@@ -574,26 +624,12 @@ export class SessionSelectorComponent extends Container {
     }
     constructor(currentSessionsLoader, allSessionsLoader, onSelect, onCancel, onExit, requestRender, options, currentSessionFilePath) {
         super();
-        this.canRename = true;
-        this.scope = "current";
-        this.sortMode = "threaded";
-        this.nameFilter = "all";
-        this.currentSessions = null;
-        this.allSessions = null;
-        this.currentLoading = false;
-        this.allLoading = false;
-        this.allLoadSeq = 0;
-        this.mode = "list";
-        this.renameInput = new Input();
-        this.renameTargetPath = null;
-        // Focusable implementation - propagate to sessionList for IME cursor positioning
-        this._focused = false;
         this.keybindings = options?.keybindings ?? KeybindingsManager.create();
         this.currentSessionsLoader = currentSessionsLoader;
         this.allSessionsLoader = allSessionsLoader;
         this.onCancel = onCancel;
         this.requestRender = requestRender;
-        this.header = new SessionSelectorHeader(this.scope, this.sortMode, this.nameFilter, this.keybindings, this.requestRender);
+        this.header = new SessionSelectorHeader(this.scope, this.sortMode, this.nameFilter, this.requestRender);
         const renameSession = options?.renameSession;
         this.renameSession = renameSession;
         this.canRename = !!renameSession;
@@ -684,7 +720,7 @@ export class SessionSelectorComponent extends Container {
         panel.addChild(new Spacer(1));
         panel.addChild(this.renameInput);
         panel.addChild(new Spacer(1));
-        panel.addChild(new Text(theme.fg("muted", "Enter to save · Esc/Ctrl+C to cancel"), 1, 0));
+        panel.addChild(new Text(theme.fg("muted", `${keyText("tui.select.confirm")} to save · ${keyText("tui.select.cancel")} to cancel`), 1, 0));
         this.buildBaseLayout(panel, { showHeader: false });
         this.requestRender();
     }