@astralyn/pi 0.85.3 → 0.86.0

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

@@ -52,7 +52,6 @@ class SessionSelectorHeader {
         this.statusMessage = null;
         this.statusTimeout = null;
         this.showRenameHint = false;
-        this.disposed = false;
         this.scope = scope;
         this.sortMode = sortMode;
         this.nameFilter = nameFilter;
@@ -91,8 +90,6 @@ class SessionSelectorHeader {
         this.statusTimeout = null;
     }
     setStatusMessage(msg, autoHideMs) {
-        if (this.disposed)
-            return;
         this.clearStatusTimeout();
         this.statusMessage = msg;
         if (!msg || !autoHideMs)
@@ -102,15 +99,8 @@ class SessionSelectorHeader {
             this.statusTimeout = null;
             this.requestRender();
         }, autoHideMs);
-        this.statusTimeout.unref?.();
     }
     invalidate() { }
-    dispose() {
-        if (this.disposed)
-            return;
-        this.disposed = true;
-        this.clearStatusTimeout();
-    }
     render(width) {
         const title = this.scope === "current" ? "Resume Session (Current Folder)" : "Resume Session (All)";
         const leftText = theme.bold(title);
@@ -247,6 +237,7 @@ class SessionList {
         this.allSessions = [];
         this.filteredSessions = [];
         this.selectedIndex = 0;
+        this.selectionTouched = false;
         this.showCwd = false;
         this.sortMode = "threaded";
         this.nameFilter = "all";
@@ -284,9 +275,18 @@ class SessionList {
         this.filterSessions(this.searchInput.getValue());
     }
     setSessions(sessions, showCwd) {
+        const selectedPath = this.selectionTouched ? this.getSelectedSessionPath() : undefined;
         this.allSessions = sessions;
         this.showCwd = showCwd;
         this.filterSessions(this.searchInput.getValue());
+        if (!this.selectionTouched) {
+            this.selectedIndex = 0;
+        }
+        else if (selectedPath) {
+            const selectedIndex = this.filteredSessions.findIndex((node) => node.session.path === selectedPath);
+            if (selectedIndex >= 0)
+                this.selectedIndex = selectedIndex;
+        }
     }
     filterSessions(query) {
         const trimmed = query.trim();
@@ -492,6 +492,7 @@ class SessionList {
             this.startDeleteConfirmationForSelectedSession();
             return;
         }
+        this.selectionTouched = true;
         // Up arrow
         if (kb.matches(keyData, "tui.select.up")) {
             this.selectedIndex = Math.max(0, this.selectedIndex - 1);
@@ -612,10 +613,8 @@ export class SessionSelectorComponent extends Container {
         this.nameFilter = "all";
         this.currentSessions = null;
         this.allSessions = null;
-        this.currentLoading = false;
-        this.allLoading = false;
-        this.allLoadSeq = 0;
-        this.disposed = false;
+        this.currentLoad = null;
+        this.allLoad = null;
         this.mode = "list";
         this.renameInput = new Input();
         this.renameTargetPath = null;
@@ -624,20 +623,12 @@ export class SessionSelectorComponent extends Container {
         this.keybindings = options?.keybindings ?? KeybindingsManager.create();
         this.currentSessionsLoader = currentSessionsLoader;
         this.allSessionsLoader = allSessionsLoader;
-        this.requestRender = () => {
-            if (!this.disposed)
-                requestRender();
-        };
+        this.requestRender = requestRender;
         this.header = new SessionSelectorHeader(this.scope, this.sortMode, this.nameFilter, this.requestRender);
         const renameSession = options?.renameSession;
         this.renameSession = renameSession;
         this.canRename = !!renameSession;
         this.header.setShowRenameHint(options?.showRenameHint ?? this.canRename);
-        this.relativeAgeInterval = setInterval(() => {
-            if (!this.disposed)
-                this.requestRender();
-        }, 60_000);
-        this.relativeAgeInterval.unref?.();
         // Create session list (starts empty, will be populated after load)
         this.sessionList = new SessionList([], false, this.sortMode, this.nameFilter, this.keybindings, currentSessionFilePath);
         this.buildBaseLayout(this.sessionList);
@@ -648,14 +639,17 @@ export class SessionSelectorComponent extends Container {
         const clearStatusMessage = () => this.header.setStatusMessage(null);
         this.sessionList.onSelect = (sessionPath) => {
             clearStatusMessage();
+            this.cancelLoads();
             onSelect(sessionPath);
         };
         this.sessionList.onCancel = () => {
             clearStatusMessage();
+            this.cancelLoads();
             onCancel();
         };
         this.sessionList.onExit = () => {
             clearStatusMessage();
+            this.cancelLoads();
             onExit();
         };
         this.sessionList.onToggleScope = () => this.toggleScope();
@@ -664,9 +658,7 @@ export class SessionSelectorComponent extends Container {
         this.sessionList.onRenameSession = (sessionPath) => {
             if (!renameSession)
                 return;
-            if (this.scope === "current" && this.currentLoading)
-                return;
-            if (this.scope === "all" && this.allLoading)
+            if (this.scope === "current" ? this.currentLoad : this.allLoad)
                 return;
             const sessions = this.scope === "all" ? (this.allSessions ?? []) : (this.currentSessions ?? []);
             const session = sessions.find((s) => s.path === sessionPath);
@@ -688,8 +680,6 @@ export class SessionSelectorComponent extends Container {
         // Handle session deletion
         this.sessionList.onDeleteSession = async (sessionPath) => {
             const result = await deleteSessionFile(sessionPath);
-            if (this.disposed)
-                return;
             if (result.ok) {
                 if (this.currentSessions) {
                     this.currentSessions = this.currentSessions.filter((s) => s.path !== sessionPath);
@@ -703,8 +693,6 @@ export class SessionSelectorComponent extends Container {
                 const msg = result.method === "trash" ? "Session moved to trash" : "Session deleted";
                 this.header.setStatusMessage({ type: "info", message: msg }, 2000);
                 await this.refreshSessionsAfterMutation();
-                if (this.disposed)
-                    return;
             }
             else {
                 const errorMessage = result.error ?? "Unknown error";
@@ -713,14 +701,21 @@ export class SessionSelectorComponent extends Container {
             this.requestRender();
         };
         // Start loading current sessions immediately
-        this.loadCurrentSessions();
+        void this.loadScope("current");
     }
-    loadCurrentSessions() {
-        void this.loadScope("current", "initial");
+    cancelLoads() {
+        if (this.currentLoad) {
+            this.currentLoad.abort();
+            this.currentLoad = null;
+            this.currentSessions = null;
+        }
+        if (this.allLoad) {
+            this.allLoad.abort();
+            this.allLoad = null;
+            this.allSessions = null;
+        }
     }
     enterRenameMode(sessionPath, currentName) {
-        if (this.disposed)
-            return;
         this.mode = "rename";
         this.renameTargetPath = sessionPath;
         this.renameInput.setValue(currentName ?? "");
@@ -735,8 +730,6 @@ export class SessionSelectorComponent extends Container {
         this.requestRender();
     }
     exitRenameMode() {
-        if (this.disposed)
-            return;
         this.mode = "list";
         this.renameTargetPath = null;
         this.buildBaseLayout(this.sessionList);
@@ -759,81 +752,83 @@ export class SessionSelectorComponent extends Container {
         }
         try {
             await renameSession(target, next);
-            if (this.disposed)
-                return;
             await this.refreshSessionsAfterMutation();
         }
         finally {
-            if (!this.disposed)
-                this.exitRenameMode();
+            this.exitRenameMode();
         }
     }
-    async loadScope(scope, reason) {
-        if (this.disposed)
+    async loadScope(scope) {
+        if (scope === "current" ? this.currentLoad : this.allLoad)
             return;
         const showCwd = scope === "all";
-        // Mark loading
+        const controller = new AbortController();
         if (scope === "current") {
-            this.currentLoading = true;
+            this.currentLoad = controller;
         }
         else {
-            this.allLoading = true;
+            this.allLoad = controller;
         }
-        const seq = scope === "all" ? ++this.allLoadSeq : undefined;
         this.header.setScope(scope);
         this.header.setLoading(true);
         this.requestRender();
-        const onProgress = (loaded, total) => {
-            if (this.disposed)
+        const isActive = () => (scope === "current" ? this.currentLoad : this.allLoad) === controller;
+        const onProgress = (loaded, total, partialSessions) => {
+            if (!isActive())
                 return;
+            if (partialSessions) {
+                const sessions = [...partialSessions];
+                if (scope === "current") {
+                    this.currentSessions = sessions;
+                }
+                else {
+                    this.allSessions = sessions;
+                }
+                if (scope === this.scope)
+                    this.sessionList.setSessions(sessions, showCwd);
+            }
             if (scope !== this.scope)
                 return;
-            if (seq !== undefined && seq !== this.allLoadSeq)
-                return;
             this.header.setProgress(loaded, total);
             this.requestRender();
         };
         try {
             const sessions = await (scope === "current"
-                ? this.currentSessionsLoader(onProgress)
-                : this.allSessionsLoader(onProgress));
-            if (this.disposed)
+                ? this.currentSessionsLoader(onProgress, controller.signal)
+                : this.allSessionsLoader(onProgress, controller.signal));
+            if (!isActive())
                 return;
             if (scope === "current") {
                 this.currentSessions = sessions;
-                this.currentLoading = false;
+                this.currentLoad = null;
             }
             else {
                 this.allSessions = sessions;
-                this.allLoading = false;
+                this.allLoad = null;
             }
             if (scope !== this.scope)
                 return;
-            if (seq !== undefined && seq !== this.allLoadSeq)
-                return;
             this.header.setLoading(false);
             this.sessionList.setSessions(sessions, showCwd);
             this.requestRender();
         }
         catch (err) {
-            if (this.disposed)
+            if (!isActive())
                 return;
             if (scope === "current") {
-                this.currentLoading = false;
+                this.currentLoad = null;
+                this.currentSessions = null;
             }
             else {
-                this.allLoading = false;
+                this.allLoad = null;
+                this.allSessions = null;
             }
             if (scope !== this.scope)
                 return;
-            if (seq !== undefined && seq !== this.allLoadSeq)
-                return;
             const message = err instanceof Error ? err.message : String(err);
             this.header.setLoading(false);
             this.header.setStatusMessage({ type: "error", message: `Failed to load sessions: ${message}` }, 4000);
-            if (reason === "initial") {
-                this.sessionList.setSessions([], showCwd);
-            }
+            this.sessionList.setSessions([], showCwd);
             this.requestRender();
         }
     }
@@ -851,42 +846,24 @@ export class SessionSelectorComponent extends Container {
         this.requestRender();
     }
     async refreshSessionsAfterMutation() {
-        await this.loadScope(this.scope, "refresh");
+        this.cancelLoads();
+        this.currentSessions = null;
+        this.allSessions = null;
+        await this.loadScope(this.scope);
     }
     toggleScope() {
-        if (this.scope === "current") {
-            this.scope = "all";
-            this.header.setScope(this.scope);
-            if (this.allSessions !== null) {
-                this.header.setLoading(false);
-                this.sessionList.setSessions(this.allSessions, true);
-                this.requestRender();
-                return;
-            }
-            if (!this.allLoading) {
-                void this.loadScope("all", "toggle");
-            }
-            return;
-        }
-        this.scope = "current";
+        this.scope = this.scope === "current" ? "all" : "current";
+        const sessions = this.scope === "current" ? this.currentSessions : this.allSessions;
+        const loading = (this.scope === "current" ? this.currentLoad : this.allLoad) !== null;
         this.header.setScope(this.scope);
-        this.header.setLoading(this.currentLoading);
-        this.sessionList.setSessions(this.currentSessions ?? [], false);
+        this.header.setLoading(loading);
+        this.sessionList.setSessions(sessions ?? [], this.scope === "all");
         this.requestRender();
+        if (sessions === null && !loading)
+            void this.loadScope(this.scope);
     }
     getSessionList() {
         return this.sessionList;
     }
-    dispose() {
-        if (this.disposed)
-            return;
-        this.disposed = true;
-        this.allLoadSeq++;
-        this.header.dispose();
-        if (this.relativeAgeInterval !== undefined) {
-            clearInterval(this.relativeAgeInterval);
-            this.relativeAgeInterval = undefined;
-        }
-    }
 }
 //# sourceMappingURL=session-selector.js.map