Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(search): fold Windows worktree container case for grouping

DavidShen04949fb1bb1f
diff --git a/apps/desktop/src/main/localDb/__tests__/conversationSearch.test.ts b/apps/desktop/src/main/localDb/__tests__/conversationSearch.test.ts
index 520471bb8d..3b3a012efa 100644
--- a/apps/desktop/src/main/localDb/__tests__/conversationSearch.test.ts
+++ b/apps/desktop/src/main/localDb/__tests__/conversationSearch.test.ts
@@ -234,6 +234,10 @@ describe('conversationSearch workingDir filtering', () => {
const rows = [
['drive', 'C:/work/repo'],
['unc', '//SERVER/Share/Work/Repo'],
+ // #7644 (unit): exercise the real DB search filter with a mixed-case container;
+ // previous fixtures only varied the base path and missed worktree folding.
+ ['worktree-drive', 'C:/Work/Repo/.CINDY-WORKTREES/topic'],
+ ['worktree-unc', '//server/share/work/repo/.XDT-WORKTREES/topic'],
['other', 'C:/work/other'],
['posix-lower', '/work/repo'],
['posix-upper', '/Work/Repo'],
@@ -248,7 +252,9 @@ describe('conversationSearch workingDir filtering', () => {
semanticMode: 'keyword',
filters: { workingDirs: ['c:\\Work\\Repo', '\\\\server\\share\\work\\repo'] },
});
- expect(windows.results.map((item) => item.session.id).sort()).toEqual(['drive', 'unc']);
+ expect(windows.results.map((item) => item.session.id).sort()).toEqual([
+ 'drive', 'unc', 'worktree-drive', 'worktree-unc',
+ ]);
const posix = await searchConversations({
query: 'needle',
diff --git a/apps/desktop/src/shared/__tests__/workingDir.test.ts b/apps/desktop/src/shared/__tests__/workingDir.test.ts
index eed9061c80..b70dc598d9 100644
--- a/apps/desktop/src/shared/__tests__/workingDir.test.ts
+++ b/apps/desktop/src/shared/__tests__/workingDir.test.ts
@@ -1,6 +1,7 @@
import { describe, expect, it } from 'vitest';
import {
+ normalizeWorkingDirForComparison,
normalizeWorkingDirForGrouping,
normalizeWorkingDirForProjectSettings,
normalizeWorkingDirForStorage,
@@ -8,6 +9,19 @@ import {
} from '../workingDir';
describe('workingDir normalization', () => {
+ // #7644 (unit): grouping and settings used to share strict container matching.
+ // Mixed-case Windows containers must become searchable without changing the settings scope.
+ it.each([
+ ['C:/Work/Repo/.CINDY-WORKTREES/topic', 'C:/Work/Repo'],
+ ['//Server/Share/Repo/.XDT-WORKTREES/topic', '//Server/Share/Repo'],
+ ])('groups %s while preserving its independent project settings', (value, base) => {
+ expect(normalizeWorkingDirForGrouping(value)).toBe(base);
+ expect(normalizeWorkingDirForComparison(value)).toBe(normalizeWorkingDirForComparison(base));
+ expect(normalizeWorkingDirForProjectSettings(value)).toBe(value);
+ const standardContainer = value.replace(/\.(CINDY|XDT)-WORKTREES/, (name) => name.toLowerCase());
+ expect(normalizeWorkingDirForProjectSettings(standardContainer)).toBe(base);
+ });
+
it('preserves significant whitespace through repeated storage normalization', () => {
for (const path of ['/repo ', '/repo /', '/repo\t']) {
const expected = path.endsWith('/') ? path.slice(0, -1) : path;
diff --git a/packages/maker-shared/src/__tests__/conversationSearch.test.ts b/packages/maker-shared/src/__tests__/conversationSearch.test.ts
index b282170dc2..7e2a2426e4 100644
--- a/packages/maker-shared/src/__tests__/conversationSearch.test.ts
+++ b/packages/maker-shared/src/__tests__/conversationSearch.test.ts
@@ -182,6 +182,20 @@ describe('filterResultsByWorkingDirs', () => {
matching: '//server/share/repo',
different: '//server/share/other',
},
+ // #7644 (unit): remote search must keep worktrees when filtering by their base
+ // project; the earlier case-variant fixtures never varied a container name.
+ {
+ name: 'worktree drive',
+ selected: 'c:/Work/Repo',
+ matching: 'C:/work/repo/.CINDY-WORKTREES/topic',
+ different: 'C:/work/other/.CINDY-WORKTREES/topic',
+ },
+ {
+ name: 'worktree UNC',
+ selected: '//Server/Share/Repo',
+ matching: '//server/share/repo/.CLAUDE/Worktrees/topic',
+ different: '//server/share/other/.CLAUDE/Worktrees/topic',
+ },
])('keeps Windows $name case variants but drops genuinely different directories', ({ selected, matching, different }) => {
const page = filterResultsByWorkingDirs(
response([
diff --git a/packages/maker-shared/src/__tests__/worktreePaths.test.ts b/packages/maker-shared/src/__tests__/worktreePaths.test.ts
index 3bbca55a00..be2edae44d 100644
--- a/packages/maker-shared/src/__tests__/worktreePaths.test.ts
+++ b/packages/maker-shared/src/__tests__/worktreePaths.test.ts
@@ -8,6 +8,33 @@ import {
} from '../worktreePaths.js';
describe('worktreePaths', () => {
+ // #7644 (unit): existing cases only use lowercase containers. A Windows path such as
+ // C:/Repo/.CINDY-WORKTREES/topic must group under C:/Repo without becoming managed.
+ // These are cross-device path strings, not paths accessed on the test host.
+ it.each([
+ ['C:/Repo/.CINDY-WORKTREES/topic', 'C:/Repo'],
+ [String.raw`C:\Repo\.Cindy-Worktrees\topic`, String.raw`C:\Repo`],
+ ['C:/Repo/.XDT-WORKTREES/topic', 'C:/Repo'],
+ ['C:/Repo/.WORKTREES/topic', 'C:/Repo'],
+ ['C:/Repo/.CLAUDE/Worktrees/topic', 'C:/Repo'],
+ [String.raw`\\Server\Share\Repo\.CINDY-WORKTREES\topic`, String.raw`\\Server\Share\Repo`],
+ ['//Server/Share/Repo/.CINDY-WORKTREES/topic', '//Server/Share/Repo'],
+ ['C:/.CINDY-WORKTREES/topic', 'C:/'],
+ ])('groups Windows container case variants without broadening managed recognition: %s', (value, base) => {
+ expect(groupingWorktreeBaseRepo(value)).toBe(base);
+ expect(managedWorktreeBaseRepo(value)).toBeNull();
+ });
+
+ it.each([
+ '/repo/.CINDY-WORKTREES/topic',
+ '/Users/me/repo/.Cindy-Worktrees/topic',
+ '/repo/.CLAUDE/Worktrees/topic',
+ 'C:/Repo/.CINDY-WORKTREES',
+ 'C:/Repo/.CINDY-WORKTREESish/topic',
+ ])('does not fold POSIX case variants, bare containers or partial names: %s', (value) => {
+ expect(groupingWorktreeBaseRepo(value)).toBeNull();
+ });
+
it('collapses Cindy-managed worktrees (current and legacy dir name) to their base repo', () => {
expect(managedWorktreeBaseRepo('/repo/.cindy-worktrees/serene-lovelace')).toBe('/repo');
expect(managedWorktreeBaseRepo('/repo/.cindy-worktrees/serene-lovelace/src/main')).toBe('/repo');
@@ -69,5 +96,7 @@ describe('worktreePaths', () => {
expect(isManagedWorktreeDirectoryName('.cindy-worktrees')).toBe(true);
expect(isManagedWorktreeDirectoryName('.xdt-worktrees')).toBe(true);
expect(isManagedWorktreeDirectoryName('.worktrees')).toBe(false);
+ expect(isManagedWorktreeDirectoryName('.CINDY-WORKTREES')).toBe(false);
+ expect(isManagedWorktreeDirectoryName('.Xdt-Worktrees')).toBe(false);
});
});
diff --git a/packages/maker-shared/src/worktreePaths.ts b/packages/maker-shared/src/worktreePaths.ts
index b30664b7c6..7b8b819d78 100644
--- a/packages/maker-shared/src/worktreePaths.ts
+++ b/packages/maker-shared/src/worktreePaths.ts
@@ -106,8 +106,13 @@ function stripTrailingSeparators(value: string, allowBackslash: boolean): string
function resolveWorktreeBase(
value: string,
containers: readonly (readonly string[])[],
+ comparison: 'exact' | 'windows-insensitive',
): string | null {
const allowBackslash = usesBackslashSeparator(value);
+ // 分组可兼容 Windows 路径的容器大小写;托管识别必须保持精确匹配,
+ // 否则会改变项目设置继承和 worktree 恢复的判定。正斜杠 UNC 也按 Windows 比较。
+ const ignoreCase = comparison === 'windows-insensitive'
+ && (allowBackslash || value.startsWith('//'));
const segments = splitPathSegments(value, allowBackslash);
for (let i = 0; i < segments.length; i += 1) {
for (const container of containers) {
@@ -115,7 +120,8 @@ function resolveWorktreeBase(
if (i + container.length >= segments.length) continue;
let matched = true;
for (let k = 0; k < container.length; k += 1) {
- if (segments[i + k].text !== container[k]) {
+ const segment = segments[i + k].text;
+ if ((ignoreCase ? segment.toLowerCase() : segment) !== container[k]) {
matched = false;
break;
}
@@ -138,18 +144,19 @@ function resolveWorktreeBase(
/**
* 解析 Cindy 托管 worktree 的 base repo(只认 `.cindy-worktrees` / `.xdt-worktrees`)。
- * 不是托管 worktree 路径时返回 null。
+ * 容器名始终精确匹配;不是托管 worktree 路径时返回 null。
*/
export function managedWorktreeBaseRepo(value: string): string | null {
- return resolveWorktreeBase(value, MANAGED_WORKTREE_CONTAINERS);
+ return resolveWorktreeBase(value, MANAGED_WORKTREE_CONTAINERS, 'exact');
}
/**
* 解析用于**项目分组**的 base repo:托管 worktree 加上 `.worktrees/<name>` 与
* `.claude/worktrees/<name>` 这两种社区约定形态。不是 worktree 路径时返回 null。
+ * Windows 盘符 / UNC 路径的容器名忽略大小写,POSIX 保持精确匹配。
*/
export function groupingWorktreeBaseRepo(value: string): string | null {
- return resolveWorktreeBase(value, GROUPING_WORKTREE_CONTAINERS);
+ return resolveWorktreeBase(value, GROUPING_WORKTREE_CONTAINERS, 'windows-insensitive');
}
/** 项目分组用:是 worktree 路径就折叠到 base repo,否则原样返回。 */