diff --git a/components.json b/components.json index 23d2036..3cb5a5a 100644 --- a/components.json +++ b/components.json @@ -20,7 +20,7 @@ "package": "workspace-groups-remote", "version": "1.1.0", "sourceRepo": "DeepsSeekHarness/workspace-groups-remote", - "sourceCommit": "413a98ba83aadb4b20ddea908b4fb2c1b47d9513", + "sourceCommit": "08a855e6e030276ae6d14370f499971bc39ca554", "vendorPath": "vendor/workspace-groups-remote" }, { diff --git a/vendor/workspace-groups-remote/lib/client.js b/vendor/workspace-groups-remote/lib/client.js index 07d0e95..e2e90c0 100644 --- a/vendor/workspace-groups-remote/lib/client.js +++ b/vendor/workspace-groups-remote/lib/client.js @@ -1479,14 +1479,22 @@ window.__ModuleLoader__.load({ const labels = memberFolderLabels(entry); const title = workspaceTitle.trim(); if (title !== "") labels.set(workspacePath, title); - const extras = effectiveFolders(workspacePath, entry).slice(1); + const nameOf = (value) => value.replace(/[((][^))]*[))]/gu, "").trim(); + const baseName = nameOf(title); + new Set((entry?.members ?? []).map((member) => member.path)); + const mergedMembers = /* @__PURE__ */ new Set(); + if (baseName !== "") { + for (const member of entry?.members ?? []) if (nameOf(labels.get(member.path) ?? folderLabel(member.path)) === baseName) mergedMembers.add(member.path); + } + const isMergedMember = (path) => [...mergedMembers].some((member) => samePath(member, path)); + const extras = effectiveFolders(workspacePath, entry).slice(1).filter((path) => !isMergedMember(path)); if (extras.length === 0) return { sessions }; const root = rootOf(workspacePath, entry); const base = []; const byFolder = /* @__PURE__ */ new Map(); for (const node of sessions) { const owner = folderOfCwd(list.byId[node.id]?.cwd, workspacePath, entry); - if (samePath(owner, workspacePath)) { + if (samePath(owner, workspacePath) || isMergedMember(owner)) { base.push(node); continue; }