Namespace codex skill names with plugin prefix

dtip · dtip · commit d7600511febf · 2026-03-03T13:13:34.000Z
diff --git a/codex/skills/ox/commit/SKILL.md b/codex/skills/ox/commit/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: commit
+name: ox:commit
 description: Commit changes with a clean commit message
 ---
 
diff --git a/codex/skills/oxgh/issue/SKILL.md b/codex/skills/oxgh/issue/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: issue
+name: oxgh:issue
 description: Create GitHub Issue
 ---
 
diff --git a/codex/skills/oxgh/merge-or-fix/SKILL.md b/codex/skills/oxgh/merge-or-fix/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: merge-or-fix
+name: oxgh:merge-or-fix
 description: Wait for AI code review on a PR — auto-merge if clean, fix issues if not
 ---
 
diff --git a/codex/skills/oxgh/open-pr/SKILL.md b/codex/skills/oxgh/open-pr/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: open-pr
+name: oxgh:open-pr
 description: Commit, push, and open a pull request
 ---
 
diff --git a/codex/skills/oxgh/shipit/SKILL.md b/codex/skills/oxgh/shipit/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: shipit
+name: oxgh:shipit
 description: Commit, push, and open a pull request with auto-merge
 ---
 
diff --git a/codex/skills/oxgh/triage/SKILL.md b/codex/skills/oxgh/triage/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: triage
+name: oxgh:triage
 description: Triage a GitHub issue (set component, priority, size, milestone)
 ---
 
diff --git a/codex/skills/oxgh/wait-for-review/SKILL.md b/codex/skills/oxgh/wait-for-review/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: wait-for-review
+name: oxgh:wait-for-review
 description: Wait for AI code review on a PR, analyze findings, and offer to address issues
 ---
 
diff --git a/codex/skills/oxgl/issue/SKILL.md b/codex/skills/oxgl/issue/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: issue
+name: oxgl:issue
 description: Create GitLab Issue
 ---
 
diff --git a/codex/skills/oxgl/merge-or-fix/SKILL.md b/codex/skills/oxgl/merge-or-fix/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: merge-or-fix
+name: oxgl:merge-or-fix
 description: Wait for AI code review on an MR — auto-merge if clean, fix issues if not
 ---
 
diff --git a/codex/skills/oxgl/open-mr/SKILL.md b/codex/skills/oxgl/open-mr/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: open-mr
+name: oxgl:open-mr
 description: Commit, push, and open a merge request
 ---
 
diff --git a/codex/skills/oxgl/shipit/SKILL.md b/codex/skills/oxgl/shipit/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: shipit
+name: oxgl:shipit
 description: Commit, push, and open a merge request with auto-merge
 ---
 
diff --git a/codex/skills/oxgl/wait-for-review/SKILL.md b/codex/skills/oxgl/wait-for-review/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: wait-for-review
+name: oxgl:wait-for-review
 description: Wait for AI code review on an MR, analyze findings, and offer to address issues
 ---
 
diff --git a/scripts/generate_codex.py b/scripts/generate_codex.py
@@ -61,9 +61,9 @@ def serialize_frontmatter(data: dict) -> str:
     return "\n".join(lines) + "\n"
 
 
-def transform_frontmatter(frontmatter: dict, skill_name: str) -> dict:
+def transform_frontmatter(frontmatter: dict, plugin_name: str, skill_name: str) -> dict:
     """Apply frontmatter rules: remove CC-specific keys, add name."""
-    result = {"name": skill_name}
+    result = {"name": f"{plugin_name}:{skill_name}"}
     if "description" in frontmatter:
         result["description"] = frontmatter["description"]
     return result
@@ -145,7 +145,7 @@ def process_skill(plugin_name: str, skill_dir: Path, output_dir: Path) -> None:
     frontmatter, body = parse_frontmatter(content)
     skill_name = skill_dir.name
 
-    new_fm = transform_frontmatter(frontmatter, skill_name)
+    new_fm = transform_frontmatter(frontmatter, plugin_name, skill_name)
     new_body = transform_body(body)
 
     out_skill_dir = output_dir / plugin_name / skill_name
@@ -243,14 +243,15 @@ def install(dest: Path, plugins: list[str]) -> None:
         for skill_dir in sorted(plugin_out.iterdir()):
             if not skill_dir.is_dir():
                 continue
-            target = dest / skill_dir.name
+            namespaced = f"{plugin_name}:{skill_dir.name}"
+            target = dest / namespaced
             if target.exists():
                 if target.is_symlink():
                     target.unlink()
                 else:
                     shutil.rmtree(target)
             shutil.copytree(skill_dir, target)
-            print(f"Copied {skill_dir.name} → {target}")
+            print(f"Copied {namespaced} → {target}")
 
 
 def link(dest: Path, plugins: list[str]) -> None:
@@ -263,14 +264,15 @@ def link(dest: Path, plugins: list[str]) -> None:
         for skill_dir in sorted(plugin_out.iterdir()):
             if not skill_dir.is_dir():
                 continue
-            target = dest / skill_dir.name
+            namespaced = f"{plugin_name}:{skill_dir.name}"
+            target = dest / namespaced
             if target.exists() or target.is_symlink():
                 if target.is_symlink() or target.is_file():
                     target.unlink()
                 else:
                     shutil.rmtree(target)
             target.symlink_to(skill_dir.resolve())
-            print(f"Linked {skill_dir.name} → {skill_dir.resolve()}")
+            print(f"Linked {namespaced} → {skill_dir.resolve()}")
 
 
 def parse_plugins(value: str) -> list[str]:
diff --git a/tests/test_generate_codex.py b/tests/test_generate_codex.py
@@ -55,9 +55,9 @@ def test_preserves_body_newlines(self) -> None:
 
 class TestSerializeFrontmatter:
     def test_basic(self) -> None:
-        data = {"name": "commit", "description": "Do stuff"}
+        data = {"name": "ox:commit", "description": "Do stuff"}
         result = serialize_frontmatter(data)
-        assert result == "---\nname: commit\ndescription: Do stuff\n---\n"
+        assert result == "---\nname: ox:commit\ndescription: Do stuff\n---\n"
 
     def test_boolean(self) -> None:
         data = {"flag": True}
@@ -68,27 +68,27 @@ def test_boolean(self) -> None:
 class TestTransformFrontmatter:
     def test_removes_allowed_tools(self) -> None:
         fm = {"allowed-tools": "Bash(git:*)", "description": "Do stuff"}
-        result = transform_frontmatter(fm, "commit")
+        result = transform_frontmatter(fm, "ox", "commit")
         assert "allowed-tools" not in result
 
     def test_removes_disable_model_invocation(self) -> None:
         fm = {"allowed-tools": "Bash(git:*)", "description": "Do stuff", "disable-model-invocation": True}
-        result = transform_frontmatter(fm, "shipit")
+        result = transform_frontmatter(fm, "oxgh", "shipit")
         assert "disable-model-invocation" not in result
 
-    def test_adds_name(self) -> None:
+    def test_adds_namespaced_name(self) -> None:
         fm = {"description": "Do stuff"}
-        result = transform_frontmatter(fm, "commit")
-        assert result["name"] == "commit"
+        result = transform_frontmatter(fm, "ox", "commit")
+        assert result["name"] == "ox:commit"
 
     def test_keeps_description(self) -> None:
         fm = {"description": "Do stuff"}
-        result = transform_frontmatter(fm, "commit")
+        result = transform_frontmatter(fm, "ox", "commit")
         assert result["description"] == "Do stuff"
 
     def test_name_first(self) -> None:
         fm = {"description": "Do stuff"}
-        result = transform_frontmatter(fm, "commit")
+        result = transform_frontmatter(fm, "ox", "commit")
         keys = list(result.keys())
         assert keys[0] == "name"
 
@@ -232,7 +232,7 @@ def test_creates_output(self, tmp_path: Path) -> None:
         process_skill("ox", skill_dir, output_dir)
 
         result = (output_dir / "ox" / "commit" / "SKILL.md").read_text()
-        assert "name: commit" in result
+        assert "name: ox:commit" in result
         assert "description: Commit changes" in result
         assert "allowed-tools" not in result
         assert "!`" not in result
@@ -272,7 +272,7 @@ def test_commit_skill(self, tmp_path: Path) -> None:
         process_skill("ox", skill_dir, tmp_path)
 
         result = (tmp_path / "ox" / "commit" / "SKILL.md").read_text()
-        assert "name: commit" in result
+        assert "name: ox:commit" in result
         assert "description: Commit changes with a clean commit message" in result
         assert "allowed-tools" not in result
         assert "!`" not in result
@@ -285,7 +285,7 @@ def test_wait_for_review_skill(self, tmp_path: Path) -> None:
         process_skill("oxgh", skill_dir, tmp_path)
 
         result = (tmp_path / "oxgh" / "wait-for-review" / "SKILL.md").read_text()
-        assert "name: wait-for-review" in result
+        assert "name: oxgh:wait-for-review" in result
         assert "${CLAUDE_PLUGIN_ROOT}" not in result
         assert "scripts/wait_for_ai_review.py" in result
         assert "disable-model-invocation" not in result
@@ -299,7 +299,7 @@ def test_shipit_skill(self, tmp_path: Path) -> None:
         process_skill("oxgh", skill_dir, tmp_path)
 
         result = (tmp_path / "oxgh" / "shipit" / "SKILL.md").read_text()
-        assert "name: shipit" in result
+        assert "name: oxgh:shipit" in result
         assert "disable-model-invocation" not in result
         assert "allowed-tools" not in result
 
@@ -316,5 +316,5 @@ def test_triage_skill(self, tmp_path: Path) -> None:
         process_skill("oxgh", skill_dir, tmp_path)
 
         result = (tmp_path / "oxgh" / "triage" / "SKILL.md").read_text()
-        assert "name: triage" in result
+        assert "name: oxgh:triage" in result
         assert "Execute each step as a separate command." in result
