diff --git a/ui/goose2/.agents/skills/code-review/SKILL.md b/.agents/skills/code-review/SKILL.md
similarity index 100%
rename from ui/goose2/.agents/skills/code-review/SKILL.md
rename to .agents/skills/code-review/SKILL.md
diff --git a/ui/goose2/.agents/skills/create-app-e2e-test/SKILL.md b/.agents/skills/create-app-e2e-test/SKILL.md
similarity index 100%
rename from ui/goose2/.agents/skills/create-app-e2e-test/SKILL.md
rename to .agents/skills/create-app-e2e-test/SKILL.md
diff --git a/ui/goose2/.agents/skills/create-pr/SKILL.md b/.agents/skills/create-pr/SKILL.md
similarity index 100%
rename from ui/goose2/.agents/skills/create-pr/SKILL.md
rename to .agents/skills/create-pr/SKILL.md
diff --git a/ui/goose2/.agents/skills/edge-case-finder/SKILL.md b/.agents/skills/edge-case-finder/SKILL.md
similarity index 100%
rename from ui/goose2/.agents/skills/edge-case-finder/SKILL.md
rename to .agents/skills/edge-case-finder/SKILL.md
diff --git a/ui/goose2/.agents/skills/edge-case-finder/references/edge-case-categories.md b/.agents/skills/edge-case-finder/references/edge-case-categories.md
similarity index 100%
rename from ui/goose2/.agents/skills/edge-case-finder/references/edge-case-categories.md
rename to .agents/skills/edge-case-finder/references/edge-case-categories.md
diff --git a/ui/goose2/.cursor/skills/code-review b/.claude/skills/code-review
similarity index 100%
rename from ui/goose2/.cursor/skills/code-review
rename to .claude/skills/code-review
diff --git a/.claude/skills/create-app-e2e-test b/.claude/skills/create-app-e2e-test
new file mode 120000
index 00000000..3e2e55d8
--- /dev/null
+++ b/.claude/skills/create-app-e2e-test
@@ -0,0 +1 @@
+../../.agents/skills/create-app-e2e-test
\ No newline at end of file
diff --git a/ui/goose2/.cursor/skills/create-pr b/.claude/skills/create-pr
similarity index 100%
rename from ui/goose2/.cursor/skills/create-pr
rename to .claude/skills/create-pr
diff --git a/ui/goose2/.cursor/skills/edge-case-finder b/.claude/skills/edge-case-finder
similarity index 100%
rename from ui/goose2/.cursor/skills/edge-case-finder
rename to .claude/skills/edge-case-finder
diff --git a/.codex/skills/code-review b/.codex/skills/code-review
new file mode 120000
index 00000000..2d88efdf
--- /dev/null
+++ b/.codex/skills/code-review
@@ -0,0 +1 @@
+../../.agents/skills/code-review
\ No newline at end of file
diff --git a/.codex/skills/create-app-e2e-test b/.codex/skills/create-app-e2e-test
new file mode 120000
index 00000000..3e2e55d8
--- /dev/null
+++ b/.codex/skills/create-app-e2e-test
@@ -0,0 +1 @@
+../../.agents/skills/create-app-e2e-test
\ No newline at end of file
diff --git a/.codex/skills/create-pr b/.codex/skills/create-pr
new file mode 120000
index 00000000..d5b42b72
--- /dev/null
+++ b/.codex/skills/create-pr
@@ -0,0 +1 @@
+../../.agents/skills/create-pr
\ No newline at end of file
diff --git a/.codex/skills/edge-case-finder b/.codex/skills/edge-case-finder
new file mode 120000
index 00000000..93db3564
--- /dev/null
+++ b/.codex/skills/edge-case-finder
@@ -0,0 +1 @@
+../../.agents/skills/edge-case-finder
\ No newline at end of file
diff --git a/.cursor/skills/code-review b/.cursor/skills/code-review
new file mode 120000
index 00000000..2d88efdf
--- /dev/null
+++ b/.cursor/skills/code-review
@@ -0,0 +1 @@
+../../.agents/skills/code-review
\ No newline at end of file
diff --git a/.cursor/skills/create-app-e2e-test b/.cursor/skills/create-app-e2e-test
new file mode 120000
index 00000000..3e2e55d8
--- /dev/null
+++ b/.cursor/skills/create-app-e2e-test
@@ -0,0 +1 @@
+../../.agents/skills/create-app-e2e-test
\ No newline at end of file
diff --git a/.cursor/skills/create-pr b/.cursor/skills/create-pr
new file mode 120000
index 00000000..d5b42b72
--- /dev/null
+++ b/.cursor/skills/create-pr
@@ -0,0 +1 @@
+../../.agents/skills/create-pr
\ No newline at end of file
diff --git a/.cursor/skills/edge-case-finder b/.cursor/skills/edge-case-finder
new file mode 120000
index 00000000..93db3564
--- /dev/null
+++ b/.cursor/skills/edge-case-finder
@@ -0,0 +1 @@
+../../.agents/skills/edge-case-finder
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 15fb5c31..23f1a062 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,7 @@ ui/desktop/src/bin/goose_llm.dll
 .hermit/
 
 # Claude
-.claude
+.claude/settings.local.json
 
 debug_*.txt