Skip to content

fix(repo): narrow Claude gitignore entry so .claude/skills/ is not ignored (swamp-club#250) #1313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stack72 merged 1 commit into from
May 5, 2026
+29 −9
Merged

fix(repo): narrow Claude gitignore entry so .claude/skills/ is not ignored (swamp-club#250) #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/domain/repo/repo_service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ const INSTRUCTIONS_FILES: Partial<Record<AiTool, string>> = {
};

const GITIGNORE_TOOL_ENTRIES: Partial<Record<AiTool, string>> = {
claude: "# Claude Code configuration (managed by swamp)\n.claude/",
claude:
"# Claude Code configuration (managed by swamp)\n.claude/worktrees/\n.claude/settings.local.json\n.claude/scheduled_tasks.lock\n.claude/scheduled_tasks.json",
cursor: "# Cursor skills (managed by swamp)\n.cursor/skills/",
opencode: "# Agent skills (managed by swamp)\n.agents/skills/",
codex: "# Agent skills (managed by swamp)\n.agents/skills/",
Expand Down
35 changes: 27 additions & 8 deletions src/domain/repo/repo_service_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,11 @@ Deno.test("RepoService.init always creates .gitignore with managed section", asy
assertStringIncludes(content, "# END swamp managed section");
assertStringIncludes(content, ".swamp/");
assertStringIncludes(content, ".swamp-sources.yaml");
assertStringIncludes(content, ".claude/");
assertStringIncludes(content, ".claude/worktrees/");
assertStringIncludes(content, ".claude/settings.local.json");
assertStringIncludes(content, ".claude/scheduled_tasks.lock");
assertStringIncludes(content, ".claude/scheduled_tasks.json");
assertEquals(content.split("\n").includes(".claude/"), false);

// Check marker persists the preference
const marker = await service.getMarker(repoPath);
Expand Down Expand Up @@ -931,7 +935,7 @@ Deno.test("RepoService.upgrade creates .gitignore when marker has gitignoreManag
"# BEGIN swamp managed section - DO NOT EDIT",
);
assertStringIncludes(content, ".swamp/");
assertStringIncludes(content, ".claude/");
assertStringIncludes(content, ".claude/worktrees/");
assertStringIncludes(content, "# END swamp managed section");
});
});
Expand Down Expand Up @@ -971,7 +975,7 @@ Deno.test("RepoService.init cursor instructions have MDC frontmatter", async ()

Deno.test("RepoService.init includes tool-specific gitignore entries", async () => {
const toolGitignoreEntries: Partial<Record<AiTool, string>> = {
claude: ".claude/",
claude: ".claude/worktrees/",
cursor: ".cursor/skills/",
opencode: ".agents/skills/",
codex: ".agents/skills/",
Expand Down Expand Up @@ -1005,6 +1009,20 @@ Deno.test("RepoService.init includes tool-specific gitignore entries", async ()
assertStringIncludes(content, "# END swamp managed section");
});
}

// Claude specifically: .claude/skills/ must NOT be gitignored so extension
// authors can commit skill sources to their extension repo.
await withTempDir(async (tempDir) => {
const service = new RepoService("0.1.0");
const repoPath = RepoPath.create(tempDir);
await service.init(repoPath, { tools: ["claude"] });
const content = await Deno.readTextFile(join(tempDir, ".gitignore"));
assertStringIncludes(content, ".claude/worktrees/");
assertStringIncludes(content, ".claude/settings.local.json");
assertStringIncludes(content, ".claude/scheduled_tasks.lock");
assertStringIncludes(content, ".claude/scheduled_tasks.json");
assertEquals(content.split("\n").includes(".claude/"), false);
});
});

// Managed .gitignore section tests
Expand Down Expand Up @@ -1039,7 +1057,7 @@ Deno.test("RepoService.init replaces managed section on tool switch", async () =
await service.init(repoPath);
const gitignorePath = join(tempDir, ".gitignore");
let content = await Deno.readTextFile(gitignorePath);
assertStringIncludes(content, ".claude/");
assertStringIncludes(content, ".claude/worktrees/");

// Re-init with cursor (force)
const result = await service.init(repoPath, {
Expand All @@ -1050,8 +1068,9 @@ Deno.test("RepoService.init replaces managed section on tool switch", async () =
assertEquals(result.gitignoreAction, "updated");
content = await Deno.readTextFile(gitignorePath);
assertStringIncludes(content, ".cursor/skills/");
// Old tool entry should be replaced
assertEquals(content.includes(".claude/"), false);
// Old tool entries should be replaced
assertEquals(content.includes(".claude/worktrees/"), false);
assertEquals(content.includes(".claude/settings.local.json"), false);
});
});

Expand Down Expand Up @@ -1140,7 +1159,7 @@ Deno.test("RepoService.init migrates legacy gitignore format", async () => {
);
assertStringIncludes(content, "# END swamp managed section");
assertStringIncludes(content, ".swamp/");
assertStringIncludes(content, ".claude/");
assertStringIncludes(content, ".claude/worktrees/");
});
});

Expand Down Expand Up @@ -2289,7 +2308,7 @@ Deno.test("RepoService.init with multiple tools writes scaffolding for each", as

// .gitignore should contain entries for both tools
const gitignore = await Deno.readTextFile(join(tempDir, ".gitignore"));
assertStringIncludes(gitignore, ".claude/");
assertStringIncludes(gitignore, ".claude/worktrees/");
assertStringIncludes(gitignore, ".kiro/skills/");
});
});
Expand Down
Loading