claudekit-codex-sync 0.2.0 → 0.2.1

package/AGENTS.md

@@ -35,11 +35,8 @@ Codex working profile for this workspace, adapted from ClaudeKit rules and workf
 - Activate relevant skills intentionally per task.
 - For legacy ClaudeKit command intents (`/ck-help`, `/coding-level`, `/ask`, `/docs/*`, `/journal`, `/watzup`), use `$claudekit-command-bridge`.
 
-## Reference Material (Imported from ClaudeKit)
-
-- `~/.codex/claudekit/CLAUDE.md`
-- `~/.codex/claudekit/rules/development-rules.md`
-- `~/.codex/claudekit/rules/primary-workflow.md`
-- `~/.codex/claudekit/rules/orchestration-protocol.md`
-- `~/.codex/claudekit/rules/documentation-management.md`
-- `~/.codex/claudekit/rules/team-coordination-rules.md`
+## Reference Material
+
+- `README.md`
+- `docs/`
+- `plans/`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudekit-codex-sync",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Sync ClaudeKit skills, agents, and config to Codex CLI",
   "main": "bin/ck-codex-sync.js",
   "bin": {
@@ -12,6 +12,11 @@
     "test": "PYTHONPATH=src python3 -m pytest tests/",
     "lint": "python3 -m py_compile src/claudekit_codex_sync/*.py"
   },
-  "keywords": ["claudekit", "codex", "sync", "skills"],
+  "keywords": [
+    "claudekit",
+    "codex",
+    "sync",
+    "skills"
+  ],
   "license": "MIT"
 }

package/src/claudekit_codex_sync/clean_target.py

@@ -23,6 +23,16 @@ def clean_target(codex_home: Path, *, dry_run: bool) -> int:
     if skills.exists():
         for item in skills.iterdir():
             if item.name == ".venv":
+                # Keep symlinks (pointing to ~/.claude/skills/.venv)
+                # Delete real venv dirs so symlink can be created on next bootstrap
+                if item.is_symlink():
+                    continue
+                # Real venv dir → delete so symlink-first strategy works
+                count = sum(1 for p in item.rglob("*") if p.is_file())
+                removed += count
+                if not dry_run:
+                    shutil.rmtree(item)
+                print("fresh: rm skills/.venv (real dir, will be re-symlinked)")
                 continue
             if item.is_dir():
                 count = sum(1 for path in item.rglob("*") if path.is_file())

package/src/claudekit_codex_sync/dep_bootstrapper.py

@@ -88,24 +88,28 @@ def bootstrap_deps(
         run_cmd(["python3", "-m", "venv", str(venv_dir)], dry_run=dry_run)
         run_cmd([str(py_bin), "-m", "pip", "install", "--upgrade", "pip"], dry_run=dry_run)
 
-    req_files = sorted(skills_dir.rglob("requirements*.txt"))
-    for req in req_files:
-        if is_excluded_path(req.parts):
-            continue
-        if not include_mcp and ("mcp-builder" in req.parts or "mcp-management" in req.parts):
-            continue
-        try:
-            run_cmd([str(py_bin), "-m", "pip", "install", "-r", str(req)], dry_run=dry_run)
-            py_ok += 1
-        except subprocess.CalledProcessError:
-            py_fail += 1
-            eprint(f"python deps failed: {req}")
-
-    node_ok, node_fail = _install_node_deps(
-        skills_dir=skills_dir,
-        include_mcp=include_mcp,
-        dry_run=dry_run,
-    )
+    # Skip dependency install when venv is symlinked — packages already in source
+    if not symlinked:
+        req_files = sorted(skills_dir.rglob("requirements*.txt"))
+        for req in req_files:
+            if is_excluded_path(req.parts):
+                continue
+            if not include_mcp and ("mcp-builder" in req.parts or "mcp-management" in req.parts):
+                continue
+            try:
+                run_cmd([str(py_bin), "-m", "pip", "install", "-r", str(req)], dry_run=dry_run)
+                py_ok += 1
+            except subprocess.CalledProcessError:
+                py_fail += 1
+                eprint(f"python deps failed: {req}")
+
+        node_ok, node_fail = _install_node_deps(
+            skills_dir=skills_dir,
+            include_mcp=include_mcp,
+            dry_run=dry_run,
+        )
+    else:
+        print("skip: deps install (venv symlinked, packages shared)")
 
     return {
         "python_ok": py_ok,

package/src/claudekit_codex_sync/runtime_verifier.py

@@ -2,10 +2,10 @@
 
 from __future__ import annotations
 
+import shutil
+import subprocess
 from pathlib import Path
-from typing import Dict, Optional, Any
-
-from .utils import run_cmd
+from typing import Any, Dict
 
 
 def verify_runtime(*, codex_home: Path, dry_run: bool) -> Dict[str, Any]:
@@ -13,19 +13,29 @@ def verify_runtime(*, codex_home: Path, dry_run: bool) -> Dict[str, Any]:
     if dry_run:
         return {"skipped": True}
 
-    run_cmd(["codex", "--help"], dry_run=False)
+    # Silent codex check — just verify it exists and runs
+    codex_bin = shutil.which("codex")
+    codex_ok = False
+    if codex_bin:
+        result = subprocess.run(
+            [codex_bin, "--version"], capture_output=True, timeout=10
+        )
+        codex_ok = result.returncode == 0
 
+    # Silent copywriting check
     copy_script = codex_home / "skills" / "copywriting" / "scripts" / "extract-writing-styles.py"
     py_bin = codex_home / "skills" / ".venv" / "bin" / "python3"
     copywriting_ok = False
     if copy_script.exists() and py_bin.exists():
-        run_cmd([str(py_bin), str(copy_script), "--list"], dry_run=False)
-        copywriting_ok = True
+        result = subprocess.run(
+            [str(py_bin), str(copy_script), "--list"], capture_output=True, timeout=30
+        )
+        copywriting_ok = result.returncode == 0
 
     prompts_count = len(list((codex_home / "prompts").glob("*.md")))
     skills_count = len(list((codex_home / "skills").rglob("SKILL.md")))
     return {
-        "codex_help": "ok",
+        "codex": "ok" if codex_ok else "missing",
         "copywriting": "ok" if copywriting_ok else "skipped",
         "prompts": prompts_count,
         "skills": skills_count,

package/tests/test_clean_target.py

@@ -18,23 +18,43 @@ def test_clean_removes_agents(tmp_path: Path):
     assert removed >= 2
 
 
-def test_clean_keeps_venv(tmp_path: Path):
-    """Clean keeps skills/.venv intact."""
+def test_clean_keeps_venv_symlink(tmp_path: Path):
+    """Clean keeps symlinked .venv but deletes real .venv dirs."""
     skills = tmp_path / "skills"
     skills.mkdir()
+
+    # Create a real source venv to symlink to
+    source_venv = tmp_path / "source_venv"
+    source_venv.mkdir()
+    (source_venv / "bin").mkdir()
+    (source_venv / "bin" / "python3").write_text("#!/usr/bin/env python3")
+
+    # Symlink .venv → source_venv (simulates symlink to ~/.claude/skills/.venv)
     venv = skills / ".venv"
-    venv.mkdir()
-    (venv / "bin").mkdir()
-    (venv / "bin" / "python3").write_text("#!/usr/bin/env python3")
+    venv.symlink_to(source_venv)
+
     skill = skills / "my-skill"
     skill.mkdir()
     (skill / "SKILL.md").write_text("# test")
 
     clean_target(tmp_path, dry_run=False)
-    assert venv.exists(), ".venv should survive cleaning"
+    assert venv.is_symlink(), "symlinked .venv should survive cleaning"
     assert not skill.exists(), "skill dirs should be removed"
 
 
+def test_clean_deletes_real_venv(tmp_path: Path):
+    """Clean deletes real (non-symlink) .venv for re-symlinking."""
+    skills = tmp_path / "skills"
+    skills.mkdir()
+    venv = skills / ".venv"
+    venv.mkdir()
+    (venv / "bin").mkdir()
+    (venv / "bin" / "python3").write_text("#!/usr/bin/env python3")
+
+    clean_target(tmp_path, dry_run=False)
+    assert not venv.exists(), "real .venv should be deleted for re-symlinking"
+
+
 def test_clean_dry_run(tmp_path: Path):
     """Dry run counts but doesn't delete."""
     agents = tmp_path / "agents"