{
+ const key = `${sessionPinScope(session)}\u0000${sidebarNodeKey(session)}`;
+ const open = expandedGroups?.has(key) ? expandedGroups.get(key) : session.sidebar_expanded === true;
+ return (
+
+ {children(session, open)}
+ {open && session.sidebar_children?.length > 0 && (
+
+ {session.sidebar_children.map((child) => {children(child, false)})}
+
+ )}
+
@@ -1656,6 +1713,10 @@ function NoWorkspaceSessionGroup({
pendingQuestionSessionIds,
remoteControlSurgeRequest = null,
onRemoteControlSurgeCompleted,
+ expandedSessionGroups,
+ onToggleSessionGroup,
+ onWorkspacePointerDown,
+ workspaceDragState,
}) {
const projectedSessions = sidebarSessionProjection(sessions, sessionListVisibleLimit);
@@ -1668,10 +1729,16 @@ function NoWorkspaceSessionGroup({
) : (
<>
- {projectedSessions.visibleSessions.map((s) => (
+ {(s, treeExpanded) => (
- ))}
+ )}
{projectedSessions.collapsible && (
@@ -1776,6 +1843,15 @@ export function Sidebar({
const [sessionListTotals, setSessionListTotals] = useState(() => new Map());
const [expanded, setExpanded] = useState(new Set());
const [expandedSessionLists, setExpandedSessionLists] = useState(new Map());
+ const [expandedSessionGroups, setExpandedSessionGroups] = useState(() => new Map());
+ const expandedSessionGroupsRef = useRef(expandedSessionGroups);
+ expandedSessionGroupsRef.current = expandedSessionGroups;
+ const treeNavigationRef = useRef(null);
+ const treeReloadRef = useRef(null);
+ const treeApplyRef = useRef(null);
+ const treeSavingRef = useRef(false);
+ const treeRevisionRef = useRef(0);
+ const treeRevealRequestedRef = useRef('');
const expandedSessionListsRef = useRef(expandedSessionLists);
expandedSessionListsRef.current = expandedSessionLists;
const [sectionExpansion, setSectionExpansion] = usePreference(
@@ -1865,6 +1941,54 @@ export function Sidebar({
() => sidebarRevealTarget(sessionSelectionIntent?.target || activeRef),
[activeRef, sessionSelectionIntent],
);
+ treeNavigationRef.current = selectedRevealTarget;
+ const sidebarTreeOptions = useCallback((scope, limit) => {
+ const prefix = `${scope}\u0000`;
+ const target = treeNavigationRef.current;
+ const targetScope = target?.noWorkspace ? NO_WORKSPACE_PIN_SCOPE : target?.workspaceHash;
+ return {
+ limit,
+ expanded: [...expandedSessionGroupsRef.current].filter(([key, open]) => open && key.startsWith(prefix))
+ .map(([key]) => key.slice(prefix.length)),
+ reveal: targetScope === scope && revealedSessionTargetRef.current !== sidebarRevealTargetKey(target)
+ ? target?.sessionId : undefined,
+ };
+ }, []);
+ const acceptSidebarTreePage = useCallback((scope, page) => {
+ if (!page?.sidebarTree) return;
+ setExpandedSessionGroups((prev) => {
+ const next = new Map(prev);
+ let changed = false;
+ for (const session of page.sessions) {
+ if (!session.sidebar_expanded || !session.sidebar_child_count) continue;
+ const key = `${scope}\u0000${sidebarNodeKey(session)}`;
+ if (next.get(key) !== true) { next.set(key, true); changed = true; }
+ }
+ if (changed) expandedSessionGroupsRef.current = next;
+ return changed ? next : prev;
+ });
+ const requestedRoots = (expandedSessionListsRef.current.get(scope) || 5)
+ + normalizePinnedIds(pinnedByWorkspaceRef.current.get(scope) || []).length;
+ if (scope !== NO_WORKSPACE_PIN_SCOPE && page.visibleRoots > requestedRoots) {
+ setExpandedSessionLists((prev) => {
+ const next = new Map(prev).set(scope, Math.ceil(page.visibleRoots / 5) * 5);
+ expandedSessionListsRef.current = next;
+ return next;
+ });
+ }
+ }, []);
+ const toggleSessionGroup = useCallback((session) => {
+ if (suppressSessionClickRef.current || treeSavingRef.current) return;
+ const scope = sessionPinScope(session);
+ const key = `${scope}\u0000${sidebarNodeKey(session)}`;
+ const previous = expandedSessionGroupsRef.current;
+ const open = previous.has(key) ? previous.get(key) : session.sidebar_expanded === true;
+ const next = new Map(previous).set(key, !open);
+ expandedSessionGroupsRef.current = next;
+ setExpandedSessionGroups(next);
+ treeRevisionRef.current += 1;
+ treeReloadRef.current?.(scope);
+ }, []);
const activeNavigationIdentity = useMemo(
() => sidebarNavigationIdentity(activeRef),
[activeRef],
@@ -2163,15 +2287,22 @@ export function Sidebar({
});
}, [finishPinnedDrag, folderGestureRef, showSessionTime, updatePinnedDragTarget, updateSessionDragScroll]);
- const updateWorkspaceDragTarget = useCallback((clientY) => {
+ const updateWorkspaceDragTarget = useCallback((clientY, clientX) => {
const drag = workspaceDragRef.current;
if (!drag) return;
- const target = workspaceDropTargetForPointer(clientY, drag.workspaceHash);
- if (!target) return;
+ drag.lastX = clientX ?? drag.lastX ?? drag.startX;
+ const target = workspaceDropTargetForPointer(clientY, drag.workspaceHash, drag.sourceId, drag.lastX);
+ if (!target) {
+ drag.targetId = '';
+ drag.targetKey = '';
+ setWorkspaceDragState({ sourceKey: drag.sourceKey, targetKey: '', placement: '' });
+ return;
+ }
drag.targetWorkspaceHash = drag.workspaceHash;
drag.targetId = target.targetId;
drag.targetKey = target.targetKey;
drag.placement = target.placement;
+ drag.targetTreeKey = target.key;
setWorkspaceDragState({
sourceKey: drag.sourceKey,
targetKey: target.targetKey,
@@ -2193,19 +2324,37 @@ export function Sidebar({
suppressSessionClickRef.current = false;
}, 80);
}
- if (commit && drag.dragging) {
- setSessions((prev) => reorderSidebarWorkspaceSession(
- prev,
- drag.workspaceHash,
- drag.sourceId,
- drag.targetId,
- drag.placement || 'before',
- ));
+ if (commit && drag.dragging && drag.targetTreeKey && drag.targetId && !treeSavingRef.current) {
+ const source = sessionsRef.current.find(session => session.id === drag.sourceId && sessionPinScope(session) === drag.workspaceHash);
+ if (!source) return;
+ treeSavingRef.current = true;
+ treeRevisionRef.current += 1;
+ workspaceSessionLoadSeqRef.current.set(drag.workspaceHash, (workspaceSessionLoadSeqRef.current.get(drag.workspaceHash) || 0) + 1);
+ const scope = drag.workspaceHash;
+ const opts = sidebarTreeOptions(scope, scope === NO_WORKSPACE_PIN_SCOPE ? 0 : (expandedSessionListsRef.current.get(scope) || 5));
+ api.moveSidebarSession(scope === NO_WORKSPACE_PIN_SCOPE ? '' : scope, {
+ source: sidebarNodeKey(source), target: drag.targetTreeKey, placement: drag.placement,
+ }, opts).then((raw) => {
+ const page = normalizeWorkspaceSessionListResponse(raw);
+ treeApplyRef.current?.(scope, page);
+ const moved = page.sessions.find(row => sidebarNodeKey(row) === sidebarNodeKey(source) || row.id === source.id);
+ const root = moved?.sidebar_parent_key
+ ? page.sessions.find(row => sidebarNodeKey(row) === moved.sidebar_parent_key) : moved;
+ if (root && root.sidebar_rank >= 5) {
+ setExpandedSessionLists(prev => {
+ const next = new Map(prev).set(scope, Math.ceil((root.sidebar_rank + 1) / 5) * 5);
+ expandedSessionListsRef.current = next;
+ return next;
+ });
+ }
+ }).catch(() => {
+ toast({ kind: 'err', text: tr('保存会话分组失败，请重试') });
+ }).finally(() => { treeSavingRef.current = false; });
}
- }, []);
+ }, [sidebarTreeOptions]);
const handleWorkspacePointerDown = useCallback((event, session, title) => {
- if (folderGestureRef.current) return;
+ if (folderGestureRef.current || treeSavingRef.current) return;
startSidebarSessionPointerDrag({
showSessionTime,
event,
@@ -2307,12 +2456,13 @@ export function Sidebar({
const applyWorkspaceSessionList = useCallback((workspace, page, { appendNewSessions = false } = {}) => {
const hash = workspace?.hash || '';
if (!hash) return;
+ acceptSidebarTreePage(hash, page);
const list = page?.sessions;
const total = page?.total;
const incoming = (Array.isArray(list) ? list : [])
.filter((session) => !isNoWorkspaceSession(session))
.map((session) => normalizeWorkspaceSession(session, workspace));
- const knownTotal = Number.isFinite(total) && total >= incoming.length
+ const knownTotal = page?.sidebarTree ? page.total : Number.isFinite(total) && total >= incoming.length
? Math.floor(total)
: incoming.length;
setSessionListTotals((prev) => {
@@ -2336,7 +2486,7 @@ export function Sidebar({
// 后端截断时 total 只是上界,拿 length 比它会把「已全量」判错;has_more
// 才是权威信号。
markWorkspaceSessionsFullyLoaded(hash, page?.hasMore === false);
- }, [markWorkspaceSessionsFullyLoaded, setSessionWorkspacesLoaded]);
+ }, [acceptSidebarTreePage, markWorkspaceSessionsFullyLoaded, setSessionWorkspacesLoaded]);
const loadWorkspaceSessions = useCallback(async (hash, { visibleCount, silent = false } = {}) => {
const workspaceHash = String(hash || '').trim();
@@ -2361,7 +2511,7 @@ export function Sidebar({
workspaceSessionLoadSeqRef.current.set(workspaceHash, sequence);
const pagePromise = (async () => {
return normalizeWorkspaceSessionListResponse(
- await api.listWorkspaceSessions(workspaceHash, query),
+ await api.listSidebarSessions(workspaceHash, sidebarTreeOptions(workspaceHash, query.limit)),
);
})();
pendingWorkspaceLoadsRef.current.set(workspaceHash, { sequence, query, promise: pagePromise });
@@ -2379,7 +2529,27 @@ export function Sidebar({
setSessionWorkspaceLoading([workspaceHash], false);
}
}
- }, [applyWorkspaceSessionList, setSessionWorkspaceLoading, workspaces]);
+ }, [applyWorkspaceSessionList, setSessionWorkspaceLoading, sidebarTreeOptions, workspaces]);
+
+ treeApplyRef.current = (scope, page) => {
+ if (scope !== NO_WORKSPACE_PIN_SCOPE) {
+ applyWorkspaceSessionList(workspaces.find(workspace => workspace.hash === scope) || { hash: scope }, page);
+ return;
+ }
+ acceptSidebarTreePage(scope, page);
+ const incoming = page.sessions.filter(isNoWorkspaceSession).map(normalizeNoWorkspaceSession);
+ setSessions(previous => retainUnrefreshedSidebarSessions(previous, incoming, {
+ refreshNoWorkspace: true, pinnedByWorkspace: pinnedByWorkspaceRef.current,
+ }));
+ };
+ treeReloadRef.current = async (scope) => {
+ if (scope !== NO_WORKSPACE_PIN_SCOPE) return loadWorkspaceSessions(scope, { silent: true });
+ const revision = treeRevisionRef.current;
+ try {
+ const data = await api.listSidebarSessions('', sidebarTreeOptions(scope, 0));
+ if (revision === treeRevisionRef.current) treeApplyRef.current(scope, normalizeWorkspaceSessionListResponse(data));
+ } catch { toast({ kind: 'err', text: tr('读取会话分组失败，请重试') }); }
+ };
const toggleSessionListExpanded = useCallback((hash, action) => {
if (!hash) return;
@@ -2420,6 +2590,8 @@ export function Sidebar({
}, [togglePinnedSession]);
const refresh = useCallback(async (preferredHash = null) => {
+ if (treeSavingRef.current) return;
+ const treeRevision = treeRevisionRef.current;
const { activeWorkspaceHash, revealTarget } = refreshSelectionRef.current;
const revealWorkspaceHash = revealTarget.noWorkspace ? '' : revealTarget.workspaceHash;
const requestedHash = preferredHash == null
@@ -2495,9 +2667,9 @@ export function Sidebar({
return {
workspace,
...normalizeWorkspaceSessionListResponse(
- await api.listWorkspaceSessions(
+ await api.listSidebarSessions(
workspace.hash,
- query,
+ sidebarTreeOptions(workspace.hash, query.limit),
),
),
};
@@ -2542,7 +2714,7 @@ export function Sidebar({
workspace.hash,
startWorkspacePageLoad(workspace),
]));
- const noWorkspaceListPromise = api.listSessions({ scope: 'no-workspace' }).catch(() => null);
+ const noWorkspaceListPromise = api.listSidebarSessions('', sidebarTreeOptions(NO_WORKSPACE_PIN_SCOPE, 0)).catch(() => null);
const pinnedTargets = new Set(pinnedRefreshTargets(withActive, earlyVisibleWorkspaceHashes));
const [pinnedPairs, noWorkspacePinnedIds] = await Promise.all([
@@ -2636,7 +2808,10 @@ export function Sidebar({
return { workspace, sequence: request.sequence, result };
}));
// 所有等待结束后再检查代次，不能让这里较慢的请求造成旧摘要回写。
- const noWorkspaceRaw = await noWorkspaceListPromise;
+ const noWorkspaceResponse = await noWorkspaceListPromise;
+ const noWorkspaceRaw = treeRevision === treeRevisionRef.current && noWorkspaceResponse
+ ? normalizeWorkspaceSessionListResponse(noWorkspaceResponse) : null;
+ if (noWorkspaceRaw) acceptSidebarTreePage(NO_WORKSPACE_PIN_SCOPE, noWorkspaceRaw);
const perWorkspace = settledPages.flatMap(({ workspace, sequence, result }) => {
if (!result.ok) return [];
if (sequence !== undefined && !sidebarWorkspacePageIsCurrent(
@@ -2647,10 +2822,10 @@ export function Sidebar({
refreshedWorkspaceHashes = perWorkspace
.map((item) => item.workspace?.hash)
.filter(Boolean);
- const noWorkspaceIncoming = (Array.isArray(noWorkspaceRaw) ? noWorkspaceRaw : [])
+ const noWorkspaceIncoming = (noWorkspaceRaw?.sessions || [])
.filter(isNoWorkspaceSession)
.map(normalizeNoWorkspaceSession);
- if (Array.isArray(noWorkspaceRaw)) desktopTaskbarBadge.replaceScope('', noWorkspaceIncoming);
+ if (noWorkspaceRaw) desktopTaskbarBadge.replaceScope('', noWorkspaceIncoming);
const incomingWorkspaceSessions = perWorkspace.flatMap((item) => (
(Array.isArray(item.sessions) ? item.sessions : [])
.filter((session) => !isNoWorkspaceSession(session))
@@ -2673,7 +2848,7 @@ export function Sidebar({
setSessions((prev) => retainUnrefreshedSidebarSessions(prev, incoming, {
refreshedWorkspaceHashes,
pinnedByWorkspace: pinnedByWorkspaceRef.current,
- refreshNoWorkspace: true,
+ refreshNoWorkspace: !!noWorkspaceRaw,
}));
setStatusBySession((prev) => incoming.reduce((map, s) => applyStatusUpdate(map, {
...s,
@@ -2700,7 +2875,7 @@ export function Sidebar({
pendingRefreshHashRef.current = '';
if (pendingHash) setTimeout(() => refresh(pendingHash).catch(() => {}), 0);
}
- }, [applyWorkspaceSessionList, markWorkspaceSessionsFullyLoaded, refreshOpencodeImportPreview, setPinnedMap, setPinnedOrder, setSessionWorkspaceLoading, setSessionWorkspacesLoaded, syncRetainedSessionIds, updateExpanded]);
+ }, [acceptSidebarTreePage, applyWorkspaceSessionList, markWorkspaceSessionsFullyLoaded, refreshOpencodeImportPreview, setPinnedMap, setPinnedOrder, setSessionWorkspaceLoading, setSessionWorkspacesLoaded, sidebarTreeOptions, syncRetainedSessionIds, updateExpanded]);
workspaceOrderRefreshRef.current = refresh;
const archiveSession = useCallback(async (session) => {
@@ -2899,6 +3074,27 @@ export function Sidebar({
() => pinnedSessionsForList(renderedSessions, pinnedByWorkspace, pinnedOrderItems),
[pinnedByWorkspace, pinnedOrderItems, renderedSessions],
);
+ useEffect(() => {
+ const target = selectedRevealTarget;
+ if (!target.sessionId) return;
+ const key = sidebarRevealTargetKey(target);
+ if (revealedSessionTargetRef.current === key) return;
+ const row = renderedSessions.find(session => sessionMatchesRevealTarget(session, target));
+ const scope = target.noWorkspace ? NO_WORKSPACE_PIN_SCOPE : target.workspaceHash;
+ if (!scope) return;
+ if (row?.sidebar_parent_key) {
+ const groupKey = `${scope}\u0000${row.sidebar_parent_key}`;
+ if (expandedSessionGroupsRef.current.get(groupKey) !== true) {
+ const next = new Map(expandedSessionGroupsRef.current).set(groupKey, true);
+ expandedSessionGroupsRef.current = next;
+ setExpandedSessionGroups(next);
+ treeReloadRef.current?.(scope);
+ }
+ } else if (!row && treeRevealRequestedRef.current !== key) {
+ treeRevealRequestedRef.current = key;
+ treeReloadRef.current?.(scope);
+ }
+ }, [selectedRevealTarget, renderedSessions]);
const unpinnedNoWorkspaceSessions = useMemo(
() => filterPinnedSessions(noWorkspaceSessions, pinnedByWorkspace),
[noWorkspaceSessions, pinnedByWorkspace],
@@ -2906,7 +3102,7 @@ export function Sidebar({
const sectionCounts = useMemo(
() => sidebarSectionCounts({
pinnedSessions,
- noWorkspaceSessions: unpinnedNoWorkspaceSessions,
+ noWorkspaceSessions: sidebarSessionRoots(unpinnedNoWorkspaceSessions),
workspaces,
}),
[pinnedSessions, unpinnedNoWorkspaceSessions, workspaces],
@@ -3726,10 +3922,14 @@ export function Sidebar({
sessions={unpinnedNoWorkspaceSessions}
sessionsLoading={false}
sessionListVisibleLimit={expandedSessionLists.get(NO_WORKSPACE_SESSION_LIST_KEY)}
+ expandedSessionGroups={expandedSessionGroups}
+ onToggleSessionGroup={toggleSessionGroup}
+ onWorkspacePointerDown={handleWorkspacePointerDown}
+ workspaceDragState={workspaceDragState}
onToggleSessionList={toggleSessionListExpanded}
activeId={activeId}
activeTarget={selectedRevealTarget}
- onSelect={(session) => selectSession({ noWorkspace: true }, session)}
+ onSelect={(session) => { if (!suppressSessionClickRef.current) selectSession({ noWorkspace: true }, session); }}
onTogglePin={togglePinnedSession}
onArchive={archiveSession}
onRenameSession={renameSession}
@@ -3790,7 +3990,9 @@ export function Sidebar({
onToggle={onToggle}
sessions={items}
sessionListVisibleLimit={expandedSessionLists.get(ws.hash)}
- sessionListTotal={sessionFullyLoadedWorkspaces.has(ws.hash) ? items.length : sessionListTotals.get(ws.hash)}
+ sessionListTotal={sessionFullyLoadedWorkspaces.has(ws.hash) ? sidebarSessionRoots(items).length : sessionListTotals.get(ws.hash)}
+ expandedSessionGroups={expandedSessionGroups}
+ onToggleSessionGroup={toggleSessionGroup}
onToggleSessionList={toggleSessionListExpanded}
activeId={activeId}
activeTarget={selectedRevealTarget}
diff --git a/web/src/components/TurnFileList.jsx b/web/src/components/TurnFileList.jsx
index fc1b4301..cab66371 100644
--- a/web/src/components/TurnFileList.jsx
+++ b/web/src/components/TurnFileList.jsx
@@ -57,8 +57,8 @@ export const TurnFileList = memo(function TurnFileList({
diff --git a/web/src/i18n/sourceCatalog.generated.js b/web/src/i18n/sourceCatalog.generated.js
index 038783c1..1c96ccdc 100644
--- a/web/src/i18n/sourceCatalog.generated.js
+++ b/web/src/i18n/sourceCatalog.generated.js
@@ -1347,6 +1347,7 @@ export const sourceCatalogs = {
"s_7e1df49bc3432fb2": "找不到该预设对应的 Provider 描述",
"s_7e2ffe585c643f17": "准断网",
"s_7e4419d1de251094": "飞书",
+ "s_7e844b903f2d6557": "保存会话分组失败，请重试",
"s_7e8586f653066a9c": "删除模型预设",
"s_7e963d9ae21a7ad5": "摘要模型",
"s_7ea852a1f549b6ca": "请输入定时任务名称",
@@ -2555,6 +2556,7 @@ export const sourceCatalogs = {
"s_f09e3585d4a4e27e": "模型连接",
"s_f0b4569c602a10a0": "使用已保存的机器人",
"s_f121ab742cefcb8e": "需要关注",
+ "s_f12653c40ff935ba": "读取会话分组失败，请重试",
"s_f1929d7304960203": "已禁用钩子",
"s_f1aa0173729f7228": "移除引用上下文",
"s_f1b0b119c244d295": "{{p0}} 个文件已更改",
@@ -4076,6 +4078,7 @@ export const sourceCatalogs = {
"s_7e1df49bc3432fb2": "The provider definition for this profile was not found",
"s_7e2ffe585c643f17": "best-effort offline",
"s_7e4419d1de251094": "Feishu",
+ "s_7e844b903f2d6557": "Could not save the session group. Please try again.",
"s_7e8586f653066a9c": "Delete model profile",
"s_7e963d9ae21a7ad5": "Summary model",
"s_7ea852a1f549b6ca": "Enter a scheduled task name",
@@ -5284,6 +5287,7 @@ export const sourceCatalogs = {
"s_f09e3585d4a4e27e": "Model connections",
"s_f0b4569c602a10a0": "Use the saved bot",
"s_f121ab742cefcb8e": "Needs attention",
+ "s_f12653c40ff935ba": "Could not load the session group. Please try again.",
"s_f1929d7304960203": "Hook disabled",
"s_f1aa0173729f7228": "Remove reference context",
"s_f1b0b119c244d295": "{{p0}} files changed",
diff --git a/web/src/lib/api.js b/web/src/lib/api.js
index 8c74e0c1..a815a4a4 100644
--- a/web/src/lib/api.js
+++ b/web/src/lib/api.js
@@ -91,6 +91,15 @@ function sessionsPath(path, opts = {}) {
return text ? `${path}?${text}` : path;
}
+function sidebarSessionsPath(hash, opts = {}) {
+ const path = hash ? `/api/workspaces/${encodeURIComponent(hash)}/session-sidebar` : '/api/session-sidebar';
+ const qs = new URLSearchParams();
+ if (Number(opts.limit) > 0) qs.set('limit', String(Math.floor(opts.limit)));
+ if (opts.expanded?.length) qs.set('expanded', JSON.stringify(opts.expanded));
+ if (opts.reveal) qs.set('reveal', String(opts.reveal));
+ return qs.size ? `${path}?${qs}` : path;
+}
+
function usagePath(opts = {}) {
const qs = new URLSearchParams();
if (opts.days != null) qs.set('days', String(opts.days));
@@ -396,6 +405,8 @@ export function createApi(base = null) {
// 仅 desktop 壳启动的 daemon 注册该端点(native_folder_picker_enabled 同款门控)。
openInExplorer: (path) => request('POST', '/api/open-in-explorer', { path }, base),
listSessions: (opts={}) => request('GET', sessionsPath('/api/sessions', opts), undefined, base),
+ listSidebarSessions: (hash, opts={}) => request('GET', sidebarSessionsPath(hash, opts), undefined, base),
+ moveSidebarSession: (hash, move, opts={}) => request('POST', sidebarSessionsPath(hash, opts), move, base),
createSession: (opts={}) => request('POST', '/api/sessions', opts, base),
listTaskSuggestions: (id, options = {}) => request('GET',
`/api/sessions/${encodeURIComponent(id)}/suggestions`, undefined, base,
diff --git a/web/src/lib/pathReferenceDropdownArchitecture.test.js b/web/src/lib/pathReferenceDropdownArchitecture.test.js
index 32985cfe..cb155b5d 100644
--- a/web/src/lib/pathReferenceDropdownArchitecture.test.js
+++ b/web/src/lib/pathReferenceDropdownArchitecture.test.js
@@ -39,7 +39,8 @@ const sessionGroup = source.indexOf("t('pathReference.sessions')");
assert.ok(fileGroup >= 0 && sessionGroup > fileGroup);
assert.equal((source.match(/overflow-y-auto/g) || []).length, 1);
assert.doesNotMatch(source, /grid-cols-2|flex-row[^\n]*pathReference\.sessions/);
-assert.doesNotMatch(source, /updated_at|updatedAt|更新时间/);
+assert.match(source, /showSessionTime = true/);
+assert.match(source, /showSessionTime \? relativeTime\(item\.updated_at \|\| item\.created_at\)/);
assert.doesNotMatch(source, /bottom-full/);
console.log('ok - path reference dropdown keeps one styled scroll surface with grouped rows');
diff --git a/web/src/lib/runTests.js b/web/src/lib/runTests.js
index b5af2c4e..583eb09f 100644
--- a/web/src/lib/runTests.js
+++ b/web/src/lib/runTests.js
@@ -271,6 +271,7 @@ import './navigationHistory.test.js';
import './navigationHistoryHandoffArchitecture.test.js';
import './gridPinnedSessions.test.js';
import './sidebarNavigation.test.js';
+import './sidebarSessionTree.test.js';
import './sidebarNoWorkspacePinningArchitecture.test.js';
import './sidebarWorkspaceHeadingArchitecture.test.js';
import './sidebarWorkspaceDragArchitecture.test.js';
diff --git a/web/src/lib/sessionReference.js b/web/src/lib/sessionReference.js
index b1ba4bc8..0161fd88 100644
--- a/web/src/lib/sessionReference.js
+++ b/web/src/lib/sessionReference.js
@@ -5,8 +5,20 @@ export const SESSION_REFERENCE_PREFIX = '@session:';
export const RECENT_SESSION_REFERENCE_LIMIT = 10;
export const SESSION_REFERENCE_VERSION = 1;
export const SESSION_REFERENCE_CACHE_TTL_MS = 60_000;
+// 空查询只要最近会话:服务端对空查询本来就最多给 50 条。
+export const SESSION_REFERENCE_RECENT_FETCH_LIMIT = 50;
+// 有查询词时取服务端按相关度排好的前 100 条(服务端上限),下拉框足够用。
+export const SESSION_REFERENCE_QUERY_LIMIT = 100;
+// 同一个查询词短时间内复用结果:光标在 @ 词里移动、退格又敲回来都不再请求。
+export const SESSION_REFERENCE_QUERY_CACHE_TTL_MS = 15_000;
+const SESSION_REFERENCE_QUERY_CACHE_MAX = 32;
+// daemon 刚启动时全局会话目录还在后台预热,结果不完整;下拉框开着就按这个
+// 间隔重查,直到目录完整。每次重查只是内存过滤,有上限防止无限轮询。
+export const SESSION_REFERENCE_CATALOG_POLL_MS = 250;
+export const SESSION_REFERENCE_CATALOG_MAX_POLLS = 120;
const sessionDataCache = new WeakMap();
+const sessionQueryCache = new WeakMap();
function stringField(value) {
return typeof value === 'string' ? value.trim() : '';
@@ -46,22 +58,60 @@ function safeDecode(value) {
}
}
+function catalogComplete(data) {
+ return !data?.progress || data.progress.complete !== false;
+}
+
+function hasGlobalSessionSearch(api) {
+ return !!api && typeof api === 'object' && typeof api.listGlobalSessions === 'function';
+}
+
+export function canLoadSessionReferences(api) {
+ return hasGlobalSessionSearch(api)
+ || (!!api && typeof api === 'object' && typeof api.listAllWorkspaceSessions === 'function');
+}
+
+function waitForCatalogPoll(ms, signal) {
+ return new Promise((resolve) => {
+ if (signal?.aborted) {
+ resolve();
+ return;
+ }
+ const finish = () => {
+ clearTimeout(timer);
+ signal?.removeEventListener?.('abort', finish);
+ resolve();
+ };
+ const timer = setTimeout(finish, ms);
+ signal?.addEventListener?.('abort', finish, { once: true });
+ });
+}
+
+// 空查询:最近会话。只需要会话目录,不再顺带请求 /api/workspaces(@ 菜单用不到项目列表)。
export async function loadSessionReferenceData(api, {
now = Date.now(),
ttlMs = SESSION_REFERENCE_CACHE_TTL_MS,
} = {}) {
- if (!api || typeof api !== 'object' || typeof api.listAllWorkspaceSessions !== 'function') {
+ if (!canLoadSessionReferences(api)) {
return { sessions: [], workspaces: [], errors: [] };
}
const cached = sessionDataCache.get(api);
if (cached?.data && now - cached.ts < ttlMs) return cached.data;
if (cached?.promise) return cached.promise;
- const promise = Promise.resolve(api.listAllWorkspaceSessions())
+ const request = hasGlobalSessionSearch(api)
+ ? () => api.listGlobalSessions({ limit: SESSION_REFERENCE_RECENT_FETCH_LIMIT })
+ : () => api.listAllWorkspaceSessions();
+ const promise = Promise.resolve(request())
.then((result) => {
const data = result && typeof result === 'object'
? result
: { sessions: [], workspaces: [], errors: [] };
- sessionDataCache.set(api, { ts: Date.now(), data, promise: null });
+ // 目录还在预热时的结果不完整,只保留给本次使用,下一次按键重新取。
+ sessionDataCache.set(api, {
+ ts: catalogComplete(data) ? Date.now() : 0,
+ data,
+ promise: null,
+ });
return data;
})
.catch((error) => {
@@ -73,7 +123,68 @@ export async function loadSessionReferenceData(api, {
}
export function invalidateSessionReferenceData(api) {
- if (api && typeof api === 'object') sessionDataCache.delete(api);
+ if (api && typeof api === 'object') {
+ sessionDataCache.delete(api);
+ sessionQueryCache.delete(api);
+ }
+}
+
+function rememberQueryResult(api, query, data) {
+ let cache = sessionQueryCache.get(api);
+ if (!cache) {
+ cache = new Map();
+ sessionQueryCache.set(api, cache);
+ }
+ cache.delete(query);
+ cache.set(query, { ts: Date.now(), data });
+ while (cache.size > SESSION_REFERENCE_QUERY_CACHE_MAX) {
+ cache.delete(cache.keys().next().value);
+ }
+}
+
+// 有查询词:交给服务端在全量会话目录里过滤(已预热的内存目录,毫秒级)。
+// 不能拿空查询的「最近 50 条」在本地过滤 —— 那样更早的会话永远搜不到
+// (实测 2.8 万个会话里,标题完全一致的会话排在第 9726 位,@ 菜单显示「没有匹配」)。
+// 正文全文搜索要逐项目读 meta、开 SQLite,全量一遍要几十秒,不在 @ 菜单里按键触发;
+// 最近一条用户消息已在 summary 里,由这里的元数据检索覆盖,全文搜索留给 Ctrl+K。
+export async function searchSessionReferenceData(api, query, {
+ signal,
+ now = Date.now(),
+ ttlMs = SESSION_REFERENCE_QUERY_CACHE_TTL_MS,
+ pollMs = SESSION_REFERENCE_CATALOG_POLL_MS,
+ maxPolls = SESSION_REFERENCE_CATALOG_MAX_POLLS,
+ onPartial,
+} = {}) {
+ const normalized = String(query || '').trim();
+ // 空查询、或没有服务端检索的旧接口:退回最近会话列表本地过滤。
+ if (!normalized || !hasGlobalSessionSearch(api)) {
+ return loadSessionReferenceData(api, { now });
+ }
+ const cached = sessionQueryCache.get(api)?.get(normalized);
+ if (cached && now - cached.ts < ttlMs) return cached.data;
+
+ let data = { sessions: [], progress: null };
+ for (let poll = 0; poll < Math.max(1, maxPolls); poll += 1) {
+ if (poll > 0) {
+ onPartial?.(data);
+ await waitForCatalogPoll(pollMs, signal);
+ if (signal?.aborted) return data;
+ }
+ const payload = await api.listGlobalSessions({
+ query: normalized,
+ limit: SESSION_REFERENCE_QUERY_LIMIT,
+ signal,
+ });
+ data = {
+ sessions: Array.isArray(payload?.sessions) ? payload.sessions : [],
+ progress: payload?.progress || null,
+ };
+ if (catalogComplete(data)) {
+ rememberQueryResult(api, normalized, data);
+ return data;
+ }
+ }
+ return data;
}
function normalizedReference(value = {}) {
diff --git a/web/src/lib/sessionReference.test.js b/web/src/lib/sessionReference.test.js
index 9eaffe96..1f1294c5 100644
--- a/web/src/lib/sessionReference.test.js
+++ b/web/src/lib/sessionReference.test.js
@@ -9,6 +9,9 @@ import {
parseSessionReferenceToken,
rankSessionReferenceCandidates,
replaceQueryWithSessionReference,
+ searchSessionReferenceData,
+ SESSION_REFERENCE_QUERY_LIMIT,
+ SESSION_REFERENCE_RECENT_FETCH_LIMIT,
sessionReferenceTokenAt,
} from './sessionReference.js';
@@ -132,3 +135,131 @@ await asyncTest('session list requests share a short-lived cache', async () => {
await loadSessionReferenceData(api);
assert.equal(calls, 2);
});
+
+// 构造一个只认服务端检索参数的假 api:记录每次 listGlobalSessions 的入参,
+// 空查询只回「最近会话」,有查询词时按标题在「全部会话」里过滤 —— 与 daemon 的
+// /api/session-search/sessions 行为一致(空查询最多 50 条,有查询时覆盖全部会话)。
+function fakeGlobalSearchApi({ recent = [], all = [], progressSequence = null } = {}) {
+ const calls = [];
+ let round = 0;
+ return {
+ calls,
+ async listGlobalSessions(options = {}) {
+ calls.push({ ...options });
+ const query = String(options.query || '');
+ const progress = progressSequence
+ ? progressSequence[Math.min(round, progressSequence.length - 1)]
+ : { complete: true };
+ round += 1;
+ const sessions = query
+ ? all.filter((session) => session.title.includes(query))
+ : recent;
+ return { sessions, errors: [], progress, next_cursor: null };
+ },
+ async listAllWorkspaceSessions() {
+ throw new Error('@ 菜单不应再走 listAllWorkspaceSessions(会多请求一次 /api/workspaces)');
+ },
+ };
+}
+
+const oldSession = {
+ id: '20260907-042156-0b2b',
+ title: '随机选择题挑战',
+ summary: '测试',
+ workspace_hash: '68380109e8268da9',
+ workspaceName: 'preserve-preview-ui-editing',
+ updated_at: '2026-09-07T04:50:33Z',
+};
+const recentSessions = Array.from({ length: 50 }, (_, index) => ({
+ id: `recent-${index}`,
+ title: `最近的会话 ${index}`,
+ workspace_hash: 'workspace-a',
+ workspaceName: 'ACECode',
+ updated_at: new Date(Date.UTC(2026, 9, 1, index)).toISOString(),
+}));
+
+// 场景:用户在 @ 后输入一个 36 天前会话的完整标题「随机选择题挑战」,而比它新的会话有上千个。
+// 期望:有查询词时把查询词交给服务端全局目录过滤(带 query 与上限),旧会话能被搜到并排第一。
+// 回归:旧实现只拉空查询的「最近 50 条」在本地过滤,目标会话不在其中,下拉框显示
+// 「没有匹配的文件、文件夹或会话」。
+await asyncTest('typed query searches the global catalog instead of filtering recent sessions', async () => {
+ const api = fakeGlobalSearchApi({
+ recent: recentSessions,
+ all: [...recentSessions, oldSession],
+ });
+ const data = await searchSessionReferenceData(api, '随机选择题挑战');
+ assert.deepEqual(api.calls.map((call) => ({ query: call.query, limit: call.limit })), [
+ { query: '随机选择题挑战', limit: SESSION_REFERENCE_QUERY_LIMIT },
+ ]);
+ const ranked = rankSessionReferenceCandidates({
+ sessions: data.sessions,
+ query: '随机选择题挑战',
+ now: Date.UTC(2026, 9, 14),
+ });
+ assert.equal(ranked[0]?.id, oldSession.id);
+ assert.equal(ranked[0]?.workspaceName, 'preserve-preview-ui-editing');
+});
+
+// 场景:光标在同一个 @ 词里移动、或删掉一个字又敲回来,同一查询词在短时间内被重复检索。
+// 期望:15 秒内同一查询词只请求一次;invalidate 后重新请求。每次按键都打一遍全量目录过滤没有必要。
+await asyncTest('same typed query reuses a short-lived cache until invalidated', async () => {
+ const api = fakeGlobalSearchApi({ recent: recentSessions, all: [oldSession] });
+ await searchSessionReferenceData(api, '随机');
+ await searchSessionReferenceData(api, ' 随机 ');
+ assert.equal(api.calls.length, 1);
+ invalidateSessionReferenceData(api);
+ await searchSessionReferenceData(api, '随机');
+ assert.equal(api.calls.length, 2);
+});
+
+// 场景:daemon 刚启动,全局会话目录还在后台预热,服务端返回 progress.complete=false 的部分结果。
+// 期望:先通过 onPartial 交出部分结果供下拉框立即显示,再按间隔重查直到目录完整;
+// 不完整的结果不进缓存(否则目录预热完成后 15 秒内仍拿到残缺结果)。
+await asyncTest('incomplete catalog is polled until complete and never cached', async () => {
+ const api = fakeGlobalSearchApi({
+ all: [oldSession],
+ progressSequence: [{ complete: false }, { complete: false }, { complete: true }],
+ });
+ const partials = [];
+ const data = await searchSessionReferenceData(api, '随机', {
+ pollMs: 0,
+ onPartial: (partial) => partials.push(partial),
+ });
+ assert.equal(api.calls.length, 3);
+ assert.equal(partials.length, 2);
+ assert.equal(data.progress.complete, true);
+ assert.equal(data.sessions[0].id, oldSession.id);
+
+ const capped = fakeGlobalSearchApi({ all: [oldSession], progressSequence: [{ complete: false }] });
+ const cappedData = await searchSessionReferenceData(capped, '随机', { pollMs: 0, maxPolls: 3 });
+ // 目录一直不完整时轮询有上限,返回最后一次的部分结果,而且不缓存。
+ assert.equal(capped.calls.length, 3);
+ assert.equal(cappedData.sessions[0].id, oldSession.id);
+ await searchSessionReferenceData(capped, '随机', { pollMs: 0, maxPolls: 1 });
+ assert.equal(capped.calls.length, 4);
+});
+
+// 场景:下拉框关闭或查询词改变,InputBar 中止上一轮检索。
+// 期望:中止后不再发起新的轮询请求(停在等待间隔里的循环立刻退出)。
+await asyncTest('aborting stops catalog polling', async () => {
+ const api = fakeGlobalSearchApi({ all: [oldSession], progressSequence: [{ complete: false }] });
+ const controller = new AbortController();
+ const pending = searchSessionReferenceData(api, '随机', {
+ signal: controller.signal,
+ pollMs: 60_000,
+ onPartial: () => controller.abort(),
+ });
+ await pending;
+ assert.equal(api.calls.length, 1);
+});
+
+// 场景:只输入 @(空查询)。
+// 期望:只向会话目录要最近 50 条,不再经 listAllWorkspaceSessions 顺带请求 /api/workspaces。
+await asyncTest('empty query loads recent sessions from the catalog only', async () => {
+ const api = fakeGlobalSearchApi({ recent: recentSessions });
+ const data = await searchSessionReferenceData(api, ' ');
+ assert.equal(api.calls.length, 1);
+ assert.equal(api.calls[0].query, undefined);
+ assert.equal(api.calls[0].limit, SESSION_REFERENCE_RECENT_FETCH_LIMIT);
+ assert.equal(data.sessions.length, recentSessions.length);
+});
diff --git a/web/src/lib/sessionReferenceComposerArchitecture.test.js b/web/src/lib/sessionReferenceComposerArchitecture.test.js
index 6d52b73f..2d61c715 100644
--- a/web/src/lib/sessionReferenceComposerArchitecture.test.js
+++ b/web/src/lib/sessionReferenceComposerArchitecture.test.js
@@ -11,8 +11,15 @@ function source(path) {
const inputBar = source('../components/InputBar.jsx');
const chatView = source('../components/ChatView.jsx');
-assert.match(inputBar, /loadSessionReferenceData\(pathReferenceApi\)/);
-assert.match(inputBar, /searchSessionUserMessages\(query, 100\)/);
+// 有查询词时必须交给服务端全局目录检索(searchSessionReferenceData),不能只拿
+// 空查询的最近 50 条在本地过滤 —— 曾因此搜不到 36 天前、标题完全一致的会话。
+assert.match(inputBar, /searchSessionReferenceData\(pathReferenceApi, query, \{/);
+assert.match(inputBar, /signal: sessionAbort\?\.signal/);
+assert.match(inputBar, /sessionAbort\?\.abort\(\);/);
+assert.doesNotMatch(inputBar, /loadSessionReferenceData\(pathReferenceApi\)/);
+// @ 词同时用于文件路径,每次按键都会触发检索;正文全量扫描要逐项目读 meta、开 SQLite,
+// 全量一遍几十秒,不能挂在这里。全文搜索留在 Ctrl+K 搜索面板。
+assert.doesNotMatch(inputBar, /searchSessionUserMessages/);
assert.match(inputBar, /currentSessionId,/);
assert.match(inputBar, /noWorkspaceLabel: t\('pathReference\.task'\)/);
assert.match(inputBar, /replaceQueryWithSessionReference\(value, pathMention\.token, item\)/);
diff --git a/web/src/lib/sidebarNoWorkspacePinningArchitecture.test.js b/web/src/lib/sidebarNoWorkspacePinningArchitecture.test.js
index 511f95b8..afafc39b 100644
--- a/web/src/lib/sidebarNoWorkspacePinningArchitecture.test.js
+++ b/web/src/lib/sidebarNoWorkspacePinningArchitecture.test.js
@@ -45,7 +45,7 @@ test('置顶投影包含任务且普通任务分组只接收未置顶任务', ()
);
assert.match(
sidebar,
- /sidebarSectionCounts\(\{[\s\S]*?noWorkspaceSessions: unpinnedNoWorkspaceSessions,[\s\S]*?workspaces,/,
+ /sidebarSectionCounts\(\{[\s\S]*?noWorkspaceSessions: sidebarSessionRoots\(unpinnedNoWorkspaceSessions\),[\s\S]*?workspaces,/,
);
assert.match(sidebar, / rows.sort((a, b) => (
+ Number.isFinite(a.sidebar_rank) && Number.isFinite(b.sidebar_rank)
+ ? a.sidebar_rank - b.sidebar_rank : 0
+ ));
+ return sort(roots).map((session) => children.has(sidebarNodeKey(session)) || session.sidebar_child_count > 0
+ ? { ...session, sidebar_children: sort(children.get(sidebarNodeKey(session)) || []) }
+ : session);
+}
+
+export function sidebarTreeTarget(sessions, sessionId) {
+ const session = sessions.find(row => row.id === sessionId);
+ if (!session?.sidebar_parent_key) return session;
+ return sessions.find(row => sidebarNodeKey(row) === session.sidebar_parent_key) || session;
+}
+
+export function validSidebarTreeDrop(source, target, placement, targetParent = null) {
+ if (!source || !target || source.key === target.key) return false;
+ if (!['before', 'after', 'inside'].includes(placement)) return false;
+ const parent = placement === 'inside' ? target.key : target.parent;
+ if (placement === 'inside' && target.parent) return false;
+ if (parent === source.key) return false;
+ if (parent && source.childCount > 0) return false;
+ if (parent) {
+ const receiver = placement === 'inside' ? target : targetParent;
+ if (receiver?.key !== parent || !receiver.scheduled || receiver.parent) return false;
+ }
+ return true;
+}
+
+export function sidebarTreeDropTarget(rows, source, clientX, clientY) {
+ if (!rows.length || !source) return null;
+ let target = rows.find(row => clientY >= row.top && clientY <= row.bottom);
+ let placement;
+ if (target) {
+ if (target.parent && clientX < target.left) {
+ target = rows.find(row => row.key === target.parent) || target;
+ placement = 'after';
+ } else {
+ const ratio = (clientY - target.top) / Math.max(1, target.bottom - target.top);
+ placement = ratio < 0.25 ? 'before' : ratio > 0.75 ? 'after' : 'inside';
+ }
+ } else {
+ target = rows.find(row => !row.parent && clientY < row.top);
+ placement = target ? 'before' : 'after';
+ if (!target) target = [...rows].reverse().find(row => !row.parent);
+ }
+ const targetParent = target?.parent ? rows.find(row => row.key === target.parent) : null;
+ return validSidebarTreeDrop(source, target, placement, targetParent) ? { ...target, placement } : null;
+}
diff --git a/web/src/lib/sidebarSessionTree.test.js b/web/src/lib/sidebarSessionTree.test.js
new file mode 100644
index 00000000..2930ef33
--- /dev/null
+++ b/web/src/lib/sidebarSessionTree.test.js
@@ -0,0 +1,50 @@
+import assert from 'node:assert/strict';
+import { sidebarSessionProjection, sidebarSessionRevealLimit } from './sidebarSessions.js';
+import { normalizeWorkspaceSessionListResponse } from './sidebarWorkspaceSessions.js';
+import { sidebarSessionRoots, sidebarTreeDropTarget, validSidebarTreeDrop } from './sidebarSessionTree.js';
+
+const group = { id: 'new', workspace_hash: 'w', sidebar_key: 'loop:daily', sidebar_rank: 0, sidebar_child_count: 12 };
+const history = Array.from({ length: 12 }, (_, i) => ({
+ id: `old-${i}`, workspace_hash: 'w', sidebar_key: `session:old-${i}`,
+ sidebar_parent_key: 'loop:daily', sidebar_rank: i,
+}));
+const ordinary = Array.from({ length: 6 }, (_, i) => ({ id: `n-${i}`, sidebar_rank: i + 1 }));
+const rows = [group, ...history, ...ordinary];
+const projection = sidebarSessionProjection(rows);
+assert.equal(projection.visibleSessions.length, 5);
+assert.equal(projection.visibleSessions[0].sidebar_children.length, 12);
+assert.equal(projection.hiddenCount, 2);
+assert.equal(sidebarSessionRoots(rows).length, 7);
+assert.equal(sidebarSessionRevealLimit(rows, { sessionId: 'old-11', workspaceHash: 'w' }), 5);
+const page = normalizeWorkspaceSessionListResponse({ sessions: rows, sidebar_tree: true, total: 7, visible_roots: 5, has_more: true });
+assert.equal(page.total, 7);
+assert.equal(page.visibleRoots, 5);
+
+const parent = { key: 'loop:parent', parent: '', scheduled: true, childCount: 1, left: 10, top: 0, bottom: 40 };
+const child = { key: 'session:child', parent: parent.key, scheduled: true, childCount: 0, left: 35, top: 40, bottom: 80 };
+const other = { key: 'session:other', parent: '', scheduled: false, childCount: 0, left: 10, top: 80, bottom: 120 };
+const single = { key: 'loop:single', parent: '', scheduled: true, childCount: 0, left: 10, top: 120, bottom: 160 };
+const targets = [parent, child, other, single];
+assert.equal(validSidebarTreeDrop(parent, other, 'inside'), false);
+assert.equal(validSidebarTreeDrop(parent, single, 'inside'), false);
+assert.equal(validSidebarTreeDrop(other, child, 'inside'), false);
+assert.equal(validSidebarTreeDrop(parent, child, 'before', parent), false);
+assert.equal(validSidebarTreeDrop(parent, other, 'before'), true);
+assert.equal(validSidebarTreeDrop(child, other, 'inside'), false);
+assert.equal(validSidebarTreeDrop(single, other, 'inside'), false);
+assert.equal(validSidebarTreeDrop(child, single, 'inside'), true);
+assert.equal(validSidebarTreeDrop(other, single, 'inside'), true);
+assert.equal(validSidebarTreeDrop(other, { ...child, parent: '' }, 'inside'), true);
+assert.equal(validSidebarTreeDrop(other, child, 'before', parent), true);
+assert.equal(validSidebarTreeDrop(other, child, 'before', { ...parent, scheduled: false }), false);
+assert.equal(validSidebarTreeDrop(other, child, 'before'), false);
+assert.equal(validSidebarTreeDrop(child, parent, 'after'), true);
+assert.equal(validSidebarTreeDrop(child, child, 'after'), false);
+assert.equal(validSidebarTreeDrop(single, parent, 'inside'), true);
+assert.deepEqual(sidebarTreeDropTarget(targets, child, 20, 60), { ...parent, placement: 'after' });
+assert.equal(sidebarTreeDropTarget(targets, child, 60, 100), null);
+assert.deepEqual(sidebarTreeDropTarget(targets, child, 60, 82), { ...other, placement: 'before' });
+assert.deepEqual(sidebarTreeDropTarget(targets, child, 60, 140), { ...single, placement: 'inside' });
+assert.deepEqual(sidebarTreeDropTarget(targets, other, 60, 42), { ...child, placement: 'before' });
+assert.equal(sidebarTreeDropTarget(targets, parent, 60, 140), null);
+console.log('[pass] sidebar tree counts roots, reveals history and only accepts children under scheduled roots');
diff --git a/web/src/lib/sidebarSessions.js b/web/src/lib/sidebarSessions.js
index c6d817c9..abe9129d 100644
--- a/web/src/lib/sidebarSessions.js
+++ b/web/src/lib/sidebarSessions.js
@@ -1,3 +1,5 @@
+import { sidebarSessionRoots, sidebarTreeTarget } from './sidebarSessionTree.js';
+
export const SIDEBAR_SESSION_COLLAPSE_LIMIT = 5;
function sessionId(session) {
@@ -225,7 +227,7 @@ export function sidebarSessionProjection(
limit = SIDEBAR_SESSION_COLLAPSE_LIMIT,
total = null,
) {
- const list = Array.isArray(sessions) ? sessions : [];
+ const list = sidebarSessionRoots(Array.isArray(sessions) ? sessions : []);
const max = sidebarSessionLimit(limit);
const visibleCount = Math.max(max, sidebarSessionLimit(visibleLimit, max));
const knownTotal = Number.isFinite(total) && total > list.length ? Math.floor(total) : list.length;
@@ -278,18 +280,22 @@ export function sessionListNeedsRevealExpansion(
limit = SIDEBAR_SESSION_COLLAPSE_LIMIT,
) {
if (!target?.sessionId) return false;
+ const root = sidebarTreeTarget(sessions, target?.sessionId);
+ const rootTarget = root ? { ...target, sessionId: root.id } : target;
const projection = sidebarSessionProjection(sessions, visibleLimit, limit);
if (!projection.collapsible) return false;
const list = Array.isArray(sessions) ? sessions : [];
const hasTarget = list.some((session) => sessionMatchesRevealTarget(session, target));
if (!hasTarget) return false;
- return !projection.visibleSessions.some((session) => sessionMatchesRevealTarget(session, target));
+ return !projection.visibleSessions.some((session) => sessionMatchesRevealTarget(session, rootTarget));
}
export function sidebarSessionRevealLimit(sessions = [], target = {}, limit = SIDEBAR_SESSION_COLLAPSE_LIMIT) {
const batchSize = sidebarSessionLimit(limit);
- const list = Array.isArray(sessions) ? sessions : [];
- const targetIndex = list.findIndex((session) => sessionMatchesRevealTarget(session, target));
+ const list = sidebarSessionRoots(Array.isArray(sessions) ? sessions : []);
+ const root = sidebarTreeTarget(sessions, target?.sessionId);
+ const rootTarget = root ? { ...target, sessionId: root.id } : target;
+ const targetIndex = list.findIndex((session) => sessionMatchesRevealTarget(session, rootTarget));
return Math.max(batchSize, Math.ceil((targetIndex + 1) / batchSize) * batchSize);
}
diff --git a/web/src/lib/sidebarWorkspaceDragArchitecture.test.js b/web/src/lib/sidebarWorkspaceDragArchitecture.test.js
index 5b2e0c84..283909fc 100644
--- a/web/src/lib/sidebarWorkspaceDragArchitecture.test.js
+++ b/web/src/lib/sidebarWorkspaceDragArchitecture.test.js
@@ -19,7 +19,7 @@ function test(name, fn) {
}
}
-test('workspace groups wire drag only to ordinary workspace session rows', () => {
+test('workspace and no-workspace groups share scope-isolated tree dragging', () => {
const sidebar = source('components/Sidebar.jsx');
const workspaceStart = sidebar.indexOf('function WorkspaceGroup({');
const noWorkspaceStart = sidebar.indexOf('\nfunction NoWorkspaceSessionGroup(', workspaceStart);
@@ -31,18 +31,19 @@ test('workspace groups wire drag only to ordinary workspace session rows', () =>
assert.match(workspaceGroup, /workspaceReorderable/);
assert.match(workspaceGroup, /onWorkspacePointerDown=\{onWorkspacePointerDown\}/);
assert.match(workspaceGroup, /workspaceDragState\?\.sourceKey === rowKey/);
- assert.doesNotMatch(noWorkspaceGroup, /workspaceReorderable|onWorkspacePointerDown|workspaceDragState/);
+ assert.match(noWorkspaceGroup, /workspaceReorderable/);
+ assert.match(noWorkspaceGroup, /onWorkspacePointerDown=\{onWorkspacePointerDown\}/);
assert.match(sidebar, /data-sidebar-workspace-session-key=\{workspaceReorderable/);
assert.match(sidebar, /data-sidebar-workspace-session-workspace=\{workspaceReorderable/);
- assert.match(sidebar, /workspaceDropTargetForPointer\(clientY, drag\.workspaceHash\)/);
+ assert.match(sidebar, /workspaceDropTargetForPointer\(clientY, drag\.workspaceHash, drag\.sourceId, drag\.lastX\)/);
assert.match(
sidebar,
/\.filter\(\(row\) => row\.dataset\.sidebarWorkspaceSessionWorkspace === workspace\)/,
);
});
-test('workspace drops update sidebar state while automatic reconciliation stays active', () => {
+test('workspace drops persist the tree while automatic reconciliation stays active', () => {
const sidebar = source('components/Sidebar.jsx');
const finishStart = sidebar.indexOf('const finishWorkspaceDrag = useCallback');
const finishEnd = sidebar.indexOf('\n const handleWorkspacePointerDown', finishStart);
@@ -51,9 +52,9 @@ test('workspace drops update sidebar state while automatic reconciliation stays
assert.match(
finishWorkspaceDrag,
- /setSessions\(\(prev\) => reorderSidebarWorkspaceSession\(\s*prev,\s*drag\.workspaceHash,\s*drag\.sourceId,\s*drag\.targetId,\s*drag\.placement \|\| 'before'/,
+ /api\.moveSidebarSession\(/,
);
- assert.doesNotMatch(finishWorkspaceDrag, /api\.|setPinnedSessions|setPinnedSessionOrder/);
+ assert.doesNotMatch(finishWorkspaceDrag, /setPinnedSessions|setPinnedSessionOrder/);
assert.match(sidebar, /setSessions\(\(prev\) => retainUnrefreshedSidebarSessions\(prev, incoming,/);
assert.match(sidebar, /promoteToTop: detail\.reason === 'session-created'/);
});
diff --git a/web/src/lib/sidebarWorkspaceHeadingArchitecture.test.js b/web/src/lib/sidebarWorkspaceHeadingArchitecture.test.js
index cbabdd05..14e305de 100644
--- a/web/src/lib/sidebarWorkspaceHeadingArchitecture.test.js
+++ b/web/src/lib/sidebarWorkspaceHeadingArchitecture.test.js
@@ -125,7 +125,7 @@ test('manual session batches survive late data and count only non-pinned rows at
const toggle = sidebar.slice(toggleStart, toggleEnd);
assert.match(toggle, /const collapsing = action === 'collapse'/);
assert.doesNotMatch(toggle, /\.then\(/);
- assert.match(sidebar, /sessionListTotal=\{sessionFullyLoadedWorkspaces\.has\(ws\.hash\) \? items\.length : sessionListTotals\.get\(ws\.hash\)\}/);
+ assert.match(sidebar, /sessionListTotal=\{sessionFullyLoadedWorkspaces\.has\(ws\.hash\) \? sidebarSessionRoots\(items\)\.length : sessionListTotals\.get\(ws\.hash\)\}/);
const controls = [...sidebar.matchAll(/ onToggleSessionList\?\.[\s\S]*?<\/button>/g)];
assert.equal(controls.length, 2);
for (const [control] of controls) {
diff --git a/web/src/lib/sidebarWorkspaceRefresh.test.js b/web/src/lib/sidebarWorkspaceRefresh.test.js
index 54431046..39de2944 100644
--- a/web/src/lib/sidebarWorkspaceRefresh.test.js
+++ b/web/src/lib/sidebarWorkspaceRefresh.test.js
@@ -63,8 +63,8 @@ function fixture({
revealTarget: { noWorkspace: false, workspaceHash: 'w' },
api: {
listWorkspaces: () => workspaceList?.promise || Promise.resolve([workspace, ...otherWorkspaces]),
- listSessions: () => noWorkspace?.promise || Promise.resolve([]),
- listWorkspaceSessions: (hash, query) => {
+ listSidebarSessions: (hash, query) => {
+ if (!hash) return noWorkspace?.promise || Promise.resolve([]);
const request = { hash, query, ...deferred() };
requests.push(request);
return request.promise;
@@ -79,6 +79,8 @@ function fixture({
connection: { subscribeWorkspaceStatus() {} },
refreshOpencodeImportPreview: async () => {},
syncRetainedSessionIds() {}, cancelSessionSelection() {}, onOpenHome() {}, onBeforeNavigate: null,
+ acceptSidebarTreePage() {},
+ sidebarTreeOptions: (scope, limit) => ({ limit }),
setPinnedMap: (value) => { context.pinnedByWorkspaceRef.current = value; },
setPinnedOrder: (value) => { context.pinnedOrderItemsRef.current = value; },
updateExpanded: (updater) => { context.expandedRef.current = updater(context.expandedRef.current); },
@@ -92,6 +94,7 @@ function fixture({
workspaceSessionLoadSeqRef: new Map(),
pendingWorkspaceLoadsRef: new Map(),
refreshingRef: false, pendingRefreshHashRef: '',
+ treeSavingRef: false, treeRevisionRef: 0,
refreshSelectionRef: { activeWorkspaceHash: 'w', revealTarget: { noWorkspace: false, workspaceHash: 'w' } },
expandedRef: new Set(['w']),
workspaceCollapseAllRef: false, userCollapsedWorkspacesRef: new Set(),
@@ -389,7 +392,7 @@ test('runtime promotion and internal workspace selection do not change refresh d
});
test('sidebar default session list is explicitly scoped to no-workspace tasks', () => {
- assert.match(source, /api.listSessions\(\{ scope: 'no-workspace' \}\)/);
+ assert.match(source, /api.listSidebarSessions\('', sidebarTreeOptions\(NO_WORKSPACE_PIN_SCOPE, 0\)\)/);
assert.doesNotMatch(source, /api.listSessions\(\)/);
});
diff --git a/web/src/lib/sidebarWorkspaceSessions.js b/web/src/lib/sidebarWorkspaceSessions.js
index 3efcc714..43550e55 100644
--- a/web/src/lib/sidebarWorkspaceSessions.js
+++ b/web/src/lib/sidebarWorkspaceSessions.js
@@ -42,6 +42,13 @@ export function normalizeWorkspaceSessionListResponse(data) {
}
const sessions = Array.isArray(data?.sessions) ? data.sessions : [];
const rawTotal = Number(data?.total);
+ if (data?.sidebar_tree === true) {
+ return {
+ sessions, total: Math.max(0, rawTotal || 0), totalExact: true,
+ hasMore: data.has_more === true, sidebarTree: true,
+ visibleRoots: Number(data.visible_roots) || 0,
+ };
+ }
const total = Number.isFinite(rawTotal) && rawTotal >= sessions.length
? Math.floor(rawTotal)
: sessions.length;
diff --git a/web/src/lib/turnFileList.js b/web/src/lib/turnFileList.js
index 8141395a..5326a9d9 100644
--- a/web/src/lib/turnFileList.js
+++ b/web/src/lib/turnFileList.js
@@ -41,6 +41,34 @@ export function turnFileDisplayPath(file, cwd) {
return normFile;
}
+const WORKTREE_DIR_MARKER = '/.acecode/worktrees/';
+
+/**
+ * 打开文件用的路径。旧版回合净差异在 worktree 会话里按会话原目录相对化,
+ * 记成 ".acecode/worktrees//src/a.cpp";而 worktree 会话的 cwd 就是
+ * "<主仓>/.acecode/worktrees/",直接拼接会重复一段,打开时报找不到文件。
+ * 相对路径以当前 worktree 自身的相对位置开头时剥掉这段前缀;其它路径原样返回。
+ * 新记录在 worktree 里一律是绝对路径,不经过这里的修正。
+ *
+ * @param {string} file 变更组的 file 字段
+ * @param {string} cwd 会话工作目录(worktree 会话为 worktree 路径)
+ * @returns {string}
+ */
+export function turnFileOpenPath(file, cwd) {
+ const normFile = normalizeSlashes(file);
+ if (!normFile || normFile.startsWith('/') || isDrivePath(normFile)) return file || '';
+ const normCwd = normalizeSlashes(cwd).replace(/\/+$/, '');
+ const markerIndex = normCwd.toLowerCase().lastIndexOf(WORKTREE_DIR_MARKER);
+ if (markerIndex < 0) return file;
+ const worktreeRel = normCwd.slice(markerIndex + 1);
+ const relativeFile = normFile.replace(/^\.\/+/, '');
+ const caseInsensitive = isDrivePath(normCwd);
+ const fileCmp = caseInsensitive ? relativeFile.toLowerCase() : relativeFile;
+ const prefixCmp = (caseInsensitive ? worktreeRel.toLowerCase() : worktreeRel) + '/';
+ if (!fileCmp.startsWith(prefixCmp)) return file;
+ return relativeFile.slice(prefixCmp.length) || file;
+}
+
function finiteNumber(value) {
const n = Number(value || 0);
return Number.isFinite(n) ? n : 0;
@@ -49,7 +77,8 @@ function finiteNumber(value) {
/**
* @param {Array<{file:string,totalAdditions?:number,totalDeletions?:number}>} groups
* @param {string} cwd 会话工作目录(相对化展示路径用)
- * @returns {Array<{file:string, displayPath:string, additions:number, deletions:number}>}
+ * @returns {Array<{file:string, openPath:string, displayPath:string, additions:number, deletions:number}>}
+ * file 是变更组的原始 key(「查看变更」按它匹配 diff 组),openPath 是打开文件用的路径。
*/
export function buildTurnFileItems(groups, cwd = '') {
if (!Array.isArray(groups)) return [];
@@ -57,9 +86,11 @@ export function buildTurnFileItems(groups, cwd = '') {
for (const group of groups) {
const file = group && typeof group.file === 'string' ? group.file : '';
if (!file) continue;
+ const openPath = turnFileOpenPath(file, cwd);
items.push({
file,
- displayPath: turnFileDisplayPath(file, cwd),
+ openPath,
+ displayPath: turnFileDisplayPath(openPath, cwd),
additions: finiteNumber(group.totalAdditions),
deletions: finiteNumber(group.totalDeletions),
});
diff --git a/web/src/lib/turnFileList.test.js b/web/src/lib/turnFileList.test.js
index 4b703470..8f530f37 100644
--- a/web/src/lib/turnFileList.test.js
+++ b/web/src/lib/turnFileList.test.js
@@ -5,6 +5,7 @@ import {
buildTurnFileItems,
splitTurnFileItems,
turnFileDisplayPath,
+ turnFileOpenPath,
} from './turnFileList.js';
function run(name, fn) {
@@ -66,11 +67,50 @@ run('buildTurnFileItems 透传加删行数并生成展示路径', () => {
{ file: 'b.js', totalAdditions: null, totalDeletions: NaN },
], 'N:/proj');
assert.deepEqual(items, [
- { file: 'N:/proj/a.js', displayPath: 'a.js', additions: 12, deletions: 3 },
- { file: 'b.js', displayPath: 'b.js', additions: 0, deletions: 0 },
+ { file: 'N:/proj/a.js', openPath: 'N:/proj/a.js', displayPath: 'a.js', additions: 12, deletions: 3 },
+ { file: 'b.js', openPath: 'b.js', displayPath: 'b.js', additions: 0, deletions: 0 },
]);
});
+run('turnFileOpenPath 剥掉旧版 worktree 净差异里重复的 worktree 前缀', () => {
+ // 场景:旧版回合净差异在 worktree 会话里按会话原目录相对化,记成
+ // ".acecode/worktrees/ses-1/src/a.cpp";会话 cwd 是 worktree 本身。
+ // 回归:直接拼接得到 ".../worktrees/ses-1/.acecode/worktrees/ses-1/src/a.cpp",
+ // 回合末尾文件卡片点「打开」报文件找不到,「查看变更」却正常。
+ // 期望:剥掉与当前 worktree 重复的前缀,只剩 worktree 内的相对路径。
+ const cwd = 'N:/Users/shao/proj/.acecode/worktrees/ses-1';
+ assert.equal(turnFileOpenPath('.acecode/worktrees/ses-1/src/a.cpp', cwd), 'src/a.cpp');
+ assert.equal(turnFileOpenPath('.acecode\\worktrees\\ses-1\\b.txt', 'N:\\Users\\shao\\proj\\.acecode\\worktrees\\ses-1\\'), 'b.txt');
+ // 盘符路径大小写不敏感
+ assert.equal(turnFileOpenPath('.ACECODE/Worktrees/SES-1/c.js', cwd), 'c.js');
+});
+
+run('turnFileOpenPath 其它路径原样返回', () => {
+ // 场景:新版净差异在 worktree 里是绝对路径;普通会话是相对路径;别的
+ // worktree 的前缀不能误剥。期望:都不改动。
+ const cwd = 'N:/Users/shao/proj/.acecode/worktrees/ses-1';
+ assert.equal(
+ turnFileOpenPath('N:/Users/shao/proj/.acecode/worktrees/ses-1/src/a.cpp', cwd),
+ 'N:/Users/shao/proj/.acecode/worktrees/ses-1/src/a.cpp',
+ );
+ assert.equal(turnFileOpenPath('.acecode/worktrees/ses-2/a.cpp', cwd), '.acecode/worktrees/ses-2/a.cpp');
+ assert.equal(turnFileOpenPath('.acecode/worktrees/ses-1/a.cpp', 'N:/Users/shao/proj'), '.acecode/worktrees/ses-1/a.cpp');
+ assert.equal(turnFileOpenPath('src/a.cpp', 'N:/Users/shao/proj'), 'src/a.cpp');
+ assert.equal(turnFileOpenPath('', cwd), '');
+});
+
+run('buildTurnFileItems 旧版 worktree 记录:展示与打开用修正路径,file 保留原始 key', () => {
+ // 场景:worktree 会话的旧记录。期望:displayPath / openPath 都是 worktree 内
+ // 的相对路径;file 保持原值,「查看变更」靠它匹配 diff 组。
+ const cwd = 'N:/Users/shao/proj/.acecode/worktrees/ses-1';
+ const [item] = buildTurnFileItems([
+ { file: '.acecode/worktrees/ses-1/src/a.cpp', totalAdditions: 1, totalDeletions: 0 },
+ ], cwd);
+ assert.equal(item.file, '.acecode/worktrees/ses-1/src/a.cpp');
+ assert.equal(item.openPath, 'src/a.cpp');
+ assert.equal(item.displayPath, 'src/a.cpp');
+});
+
run('buildTurnFileItems 跳过非法条目,非数组输入返回空数组', () => {
// 场景:上游聚合可能混入 file 为空/缺失的脏数据;整个 groups 也可能是 null
//(会话切换的瞬时帧)。期望:不抛异常,静默过滤。
@@ -137,7 +177,7 @@ run('轮次文件入口把稳定 user message UUID 贯穿列表、页签和详
const previewDetails = readFileSync(new URL('../components/PreviewDetailsPanel.jsx', import.meta.url), 'utf8');
assert.match(turnFileList, /onOpenChanges\?\.\(item\.file, turnUserMessageId\)/);
- assert.match(turnFileList, /onOpenFile\?\.\(item\.file\)/);
+ assert.match(turnFileList, /onOpenFile\?\.\(item\.openPath\)/);
const lists = [...chatView.matchAll(/]*\/>/g)];
assert.equal(lists.length, 2);
for (const [list] of lists) {
diff --git a/web/src/styles/globals.css b/web/src/styles/globals.css
index 452ff20b..d9d78b13 100644
--- a/web/src/styles/globals.css
+++ b/web/src/styles/globals.css
@@ -2635,6 +2635,35 @@ body {
.ace-sidebar-workspace-session-row.is-drop-after::after {
bottom: -2px;
}
+.ace-sidebar-session-tree-node { position: relative; }
+.ace-sidebar-session-tree-children {
+ margin-left: 18px;
+ padding-left: 6px;
+ border-left: 1px solid var(--ace-border);
+}
+.ace-sidebar-session-tree-child:not(.is-tree-active) { background: rgba(0, 0, 0, 0.04); }
+[data-theme="dark"] .ace-sidebar-session-tree-child:not(.is-tree-active) { background: rgba(0, 0, 0, 0.20); }
+.ace-sidebar-session-tree-child:not(.is-tree-active):hover { background: var(--ace-surface-hi); }
+.ace-sidebar-session-tree-chevron { pointer-events: none; }
+.ace-sidebar-session-tree-chevron.is-expanded { transform: rotate(90deg); }
+.ace-sidebar-session-row.is-drop-inside {
+ background: var(--ace-accent-bg);
+ outline: 1px solid var(--ace-accent);
+ outline-offset: -1px;
+}
+.ace-sidebar-session-tree-node.is-tree-dragging { opacity: 0.46; }
+.ace-sidebar-session-tree-node.is-tree-dragging > .is-dragging { opacity: 1; }
+.ace-sidebar-session-tree-node[data-tree-drop="after"] > .is-drop-after::after { display: none; }
+.ace-sidebar-session-tree-node[data-tree-drop="after"]::after {
+ content: "";
+ position: absolute;
+ bottom: -2px;
+ left: 22px;
+ right: 8px;
+ height: 2px;
+ background: var(--ace-accent);
+ pointer-events: none;
+}
.ace-sidebar-session-drag-ghost {
position: fixed;
z-index: 80;