feat(session-folders): folder organization, sub-folders, delete confirmations, and UX improvements (#469)
* feat(session-folders): drag-to-folder DnD, sort by activity, and UX improvements - Add DraggableSessionRow wrapping each session row so the whole row is draggable; stopPropagation prevents outer group-reorder DnD from firing - Add DroppableFolderWrapper + SessionFolderDndScope (inner DndContext scoped per group) with closestCenter collision detection - DragOverlay matches exact width/height of dragged row so cursor stays aligned - Folder header highlights (ring + primary colour) when a session hovers over it during drag - + button on folder header opens a dropdown: 'New session' / 'New folder' - + button on each folder row creates a session scoped to that folder - Empty folders are no longer auto-deleted (removed .filter(sessionIds.length>0) from addSessionToFolder / removeSessionFromFolder / cleanupSessions) - Sessions inside a folder are sorted by most-recent activity (same compareSessionsByPinnedAndTime logic used everywhere else) - Sort comparator now takes sessionAttentionStates so lastUserMessageAt / lastStatusChangeAt is used when newer than session.time.updated; all sort call-sites and their useMemo/useCallback deps updated accordingly - Remove foldersMap from cleanup effect deps to prevent cascade re-renders when folders change; read current value via getState() instead * fix(session-folders): new session is placed into the correct folder sendMessage() was calling useSessionManagementStore.createSession() directly, bypassing the targetFolderId logic in useSessionStore.createSession. Fix: read targetFolderId from draft at the top of the draft branch in sendMessage, then call addSessionToFolder immediately after the session is created and before the draft is closed. Also propagate targetFolderId through openNewSessionDraft options and NewSessionDraftState type. * feat(session-folders): add sub-folder support (one level deep) - SessionFolder gains optional parentId field for hierarchy - createFolder accepts parentId to create sub-folders - deleteFolder cascades to remove all child sub-folders - SessionFolderItem renders sub-folders before sessions in body; new sub-folder button (RiFolderAddLine) visible at depth 0 only - renderOneFolderItem in SessionSidebar builds the tree recursively; sub-folders are indented via depth prop (ml-3 on root's children) - Persist/hydrate parentId correctly from localStorage * feat(session): add delete confirm dialogs and improve subtitle UX - Add confirmation dialogs before deleting sessions or folders - Show relative time (e.g., '2h ago', '35min ago') for recent sessions - Replace +/- diff numbers with file change count (e.g., '3 files changed') - New folders use default name without forcing rename - Cleaner, less cluttered session list UI * fix(session-folders): skip folder cleanup while sessions are loading Prevents race condition on reload where cleanupSessions() runs before the server returns the full session list, causing folder-session assignments to be incorrectly wiped from localStorage.
This commit is contained in:
committed by
GitHub
parent
107e19a0dd
commit
5fc4feee42
@@ -17,6 +17,7 @@ import { opencodeClient } from "@/lib/opencode/client";
|
||||
import { useDirectoryStore } from "./useDirectoryStore";
|
||||
import { useConfigStore } from "./useConfigStore";
|
||||
import { useProjectsStore } from "./useProjectsStore";
|
||||
import { useSessionFoldersStore } from "./useSessionFoldersStore";
|
||||
import { EXECUTION_FORK_META_TEXT } from "@/lib/messages/executionMeta";
|
||||
import { flattenAssistantTextParts } from "@/lib/messages/messageText";
|
||||
|
||||
@@ -150,6 +151,7 @@ export const useSessionStore = create<SessionStore>()(
|
||||
title: options?.title,
|
||||
initialPrompt: options?.initialPrompt,
|
||||
syntheticParts: options?.syntheticParts,
|
||||
targetFolderId: options?.targetFolderId,
|
||||
},
|
||||
currentSessionId: null,
|
||||
error: null,
|
||||
@@ -186,18 +188,24 @@ export const useSessionStore = create<SessionStore>()(
|
||||
closeNewSessionDraft: () => {
|
||||
const realCurrentSessionId = useSessionManagementStore.getState().currentSessionId;
|
||||
set({
|
||||
newSessionDraft: { open: false, directoryOverride: null, parentID: null, title: undefined, initialPrompt: undefined, syntheticParts: undefined },
|
||||
newSessionDraft: { open: false, directoryOverride: null, parentID: null, title: undefined, initialPrompt: undefined, syntheticParts: undefined, targetFolderId: undefined },
|
||||
currentSessionId: realCurrentSessionId,
|
||||
});
|
||||
},
|
||||
|
||||
createSession: async (title?: string, directoryOverride?: string | null, parentID?: string | null) => {
|
||||
const draft = get().newSessionDraft;
|
||||
const targetFolderId = draft.targetFolderId;
|
||||
get().closeNewSessionDraft();
|
||||
|
||||
const result = await useSessionManagementStore.getState().createSession(title, directoryOverride, parentID);
|
||||
|
||||
if (result?.id) {
|
||||
await get().setCurrentSession(result.id);
|
||||
const finalScopeKey = directoryOverride || get().lastLoadedDirectory || result.directory;
|
||||
if (targetFolderId && finalScopeKey) {
|
||||
useSessionFoldersStore.getState().addSessionToFolder(finalScopeKey, targetFolderId, result.id);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
},
|
||||
@@ -348,9 +356,12 @@ export const useSessionStore = create<SessionStore>()(
|
||||
};
|
||||
|
||||
if (draft?.open) {
|
||||
const draftTargetFolderId = draft.targetFolderId;
|
||||
const draftDirectoryOverride = draft.directoryOverride ?? null;
|
||||
|
||||
const created = await useSessionManagementStore
|
||||
.getState()
|
||||
.createSession(draft.title, draft.directoryOverride ?? null, draft.parentID ?? null);
|
||||
.createSession(draft.title, draftDirectoryOverride, draft.parentID ?? null);
|
||||
|
||||
if (!created?.id) {
|
||||
throw new Error('Failed to create session');
|
||||
@@ -410,6 +421,15 @@ export const useSessionStore = create<SessionStore>()(
|
||||
const draftSyntheticParts = draft.syntheticParts;
|
||||
|
||||
get().closeNewSessionDraft();
|
||||
|
||||
// Assign to target folder if session was created from folder's + button
|
||||
if (draftTargetFolderId) {
|
||||
const scopeKey = draftDirectoryOverride || created.directory || null;
|
||||
if (scopeKey) {
|
||||
useSessionFoldersStore.getState().addSessionToFolder(scopeKey, draftTargetFolderId, created.id);
|
||||
}
|
||||
}
|
||||
|
||||
setStatus(created.id, 'busy');
|
||||
|
||||
// Merge draft synthetic parts with any additional parts passed to sendMessage
|
||||
|
||||
Reference in New Issue
Block a user