Beautiful, AI-native markdown IDE and LLM wiki
TypeScript 2nd-brainagent-skillsclaudecodexcompany-braindocsknowledge-knowledge-baseknowledge-managementllmllm-wikillm-wiki-karpathymarkdownmarkdown-editormdmdxnotespkmsecond-brainskills
fix(open-knowledge): don't treat a linked-worktree subfolder as a project root (#2204)
miles-kt-inkeep111d494ed295
diff --git a/.changeset/fix-worktree-subfolder-project-root.md b/.changeset/fix-worktree-subfolder-project-root.mdnew file mode 100644index 000000000..f84686fcb--- /dev/null+++ b/.changeset/fix-worktree-subfolder-project-root.md@@ -0,0 +1,5 @@+---+"@inkeep/open-knowledge": patch+---++Fix Open Knowledge Desktop offering to set up a project inside a subfolder of a linked git worktree. Picking a subdirectory (for example `public/open-knowledge`) inside a `git worktree add` checkout misclassified it as a worktree root and showed "Setup Open Knowledge in this folder" in place, scaffolding `.ok/` in the subfolder instead of promoting to the git root. Subfolders of a linked worktree now correctly fall through to git-root promotion; only the worktree root itself is treated as a standalone project.diff --git a/packages/desktop/src/main/folder-admission.test.ts b/packages/desktop/src/main/folder-admission.test.tsindex 73a2fb585..b37a352d4 100644--- a/packages/desktop/src/main/folder-admission.test.ts+++ b/packages/desktop/src/main/folder-admission.test.ts@@ -378,6 +378,45 @@ describe('discoverProject — fresh kind, git-root promotion (FR-2a)', () => {});});+describe('discoverProject — linked-worktree carveout scoping', () => {+ test('subfolder of a linked worktree promotes to the git root, not in-place Setup', async () => {+ const worktree = resolve(fakeHome, 'wt');+ const sub = resolve(worktree, 'public/open-knowledge');+ mkdirSync(sub, { recursive: true });+ writeFileSync(resolve(worktree, '.git'), 'gitdir: /main/.git/worktrees/wt\n');++ const result = await discoverProject(sub, {+ homeDir: fakeHome,+ gitTopLevel: stubGitTopLevel({ [sub]: worktree }),+ dirSizeProbe: null,+ });++ expect(result.kind).toBe('fresh');+ if (result.kind !== 'fresh') return;+ expect(result.projectDir).toBe(worktree);+ expect(result.gitRootPromoted).toBe(true);+ });++ test('the linked-worktree root itself still classifies standalone under an ancestor .ok/', async () => {+ const parent = resolve(fakeHome, 'parent');+ const worktree = resolve(parent, 'wt');+ mkdirSync(worktree, { recursive: true });+ writeOkConfig(parent);+ writeFileSync(resolve(worktree, '.git'), 'gitdir: /main/.git/worktrees/wt\n');++ const result = await discoverProject(worktree, {+ homeDir: fakeHome,+ gitTopLevel: stubGitTopLevel({ [worktree]: worktree }),+ dirSizeProbe: null,+ });++ expect(result.kind).toBe('fresh');+ if (result.kind !== 'fresh') return;+ expect(result.projectDir).toBe(worktree);+ expect(result.gitRootPromoted).toBe(false);+ });+});+describe('discoverProject — gitState detection', () => {test('shell-only: .git directory present but HEAD missing (the J5 case)', async () => {const folder = resolve(fakeHome, 'shell-git');diff --git a/packages/desktop/src/main/folder-admission.ts b/packages/desktop/src/main/folder-admission.tsindex 3c88f86c6..9e3a2019e 100644--- a/packages/desktop/src/main/folder-admission.ts+++ b/packages/desktop/src/main/folder-admission.ts@@ -237,7 +237,8 @@ function computeGitState(projectDir: string): GitState {function isPickedPathLinkedWorktreeRoot(pickedPath: string): boolean {try {- return resolveGitDirDetailed(pickedPath).kind === 'linked';+ const resolved = resolveGitDirDetailed(pickedPath);+ return resolved.kind === 'linked' && resolved.projectSubPath === '';} catch {return false;}