claudekit-codex-sync 0.2.1 → 0.2.2

package/README.md

@@ -13,7 +13,7 @@ ClaudeKit uses `~/.claude/` conventions and agent markdown frontmatter. Codex us
 | **Scope select** | Sync to project `./.codex/` (default) or global `~/.codex/` (`-g`) |
 | **Fresh clean** | Optional `-f` cleanup of target dirs before sync |
 | **Source resolve** | Uses live `~/.claude/` or `--zip` export |
-| **Asset sync** | Copies commands/output-styles/scripts and `.env.example` to `codex_home/claudekit/` |
+| **Asset sync** | Copies agents `.md` → `agents/` (for TOML conversion), commands/output-styles/rules/scripts → `codex_home/claudekit/` |
 | **Skill sync** | Copies skills into `codex_home/skills/` |
 | **Path normalize** | Rewrites `.claude` references to `.codex` |
 | **Config enforce** | Ensures `config.toml`, feature flags, and agent registration |

package/docs/codebase-summary.md

@@ -18,7 +18,7 @@
 ### Core Orchestration
 
 - **`cli.py`** — Main entry point with 8-flag interface (`-g`, `-f`, `--force`, `--zip`, `--source`, `--mcp`, `--no-deps`, `-n`).
-- **`clean_target.py`** — Fresh-sync cleaner for `--fresh` (preserves `skills/.venv`).
+- **`clean_target.py`** — Fresh-sync cleaner for `--fresh` (deletes real `.venv`, keeps symlinks).
 
 ### Source Resolution
 
@@ -26,7 +26,7 @@
 
 ### Asset & Skill Sync
 
-- **`asset_sync_dir.py`** — Live sync for assets and skills with registry-aware overwrite/backup behavior for managed assets.
+- **`asset_sync_dir.py`** — Live sync for assets, agents, and skills. Copies agents directly to `codex_home/agents/` for TOML conversion. Registry-aware overwrite/backup.
 - **`asset_sync_zip.py`** — Zip-based sync path.
 
 ### Normalization & Conversion
@@ -75,6 +75,6 @@ Configured Codex home (.codex project scope or ~/.codex global)
 |---|---|
 | `tests/test_config_enforcer.py` | 4 |
 | `tests/test_path_normalizer.py` | 7 |
-| `tests/test_clean_target.py` | 4 |
+| `tests/test_clean_target.py` | 5 |
 | `tests/test_cli_args.py` | 6 |
-| **Total** | **21** |
+| **Total** | **22** |

package/docs/system-architecture.md

@@ -6,9 +6,11 @@
 ┌─────────────────────┐    ┌──────────────────────────┐
 │ ClaudeKit Source     │    │ Codex Target              │
 │ ~/.claude/ or zip    │───▶│ ./.codex or ~/.codex      │
+│   agents/*.md        │    │   agents/*.toml (convert) │
 │   skills/*           │    │   skills/*                │
 │   commands/          │    │   claudekit/commands/     │
 │   output-styles/     │    │   claudekit/output-styles/│
+│   rules/             │    │   claudekit/rules/        │
 │   scripts/           │    │   claudekit/scripts/      │
 └─────────────────────┘    │   prompts/* (generated)   │
                             │   config.toml             │
@@ -25,12 +27,15 @@ Workspace baseline: `./AGENTS.md` is ensured in the current working directory.
 - Select source: live (`~/.claude/`) or zip (`--zip`)
 
 2. **Asset/skill sync**
-- Copy managed assets and skills
+- Copy agents `.md` directly to `codex_home/agents/` (for TOML conversion)
+- Copy managed assets (commands, output-styles, rules, scripts) to `codex_home/claudekit/`
+- Copy skills to `codex_home/skills/`
 - Apply registry-aware overwrite behavior (`--force`)
 
 3. **Normalization**
 - Rewrite `.claude` references to `.codex`
-- Normalize agent TOMLs and compatibility patches
+- Convert agent `.md` (YAML frontmatter) → `.toml` with model mapping
+- Normalize existing agent TOMLs and compatibility patches
 
 4. **Config enforcement**
 - Enforce `config.toml` defaults
@@ -64,6 +69,7 @@ Workspace baseline: `./AGENTS.md` is ensured in the current working directory.
 ## Design Notes
 
 - Project-first scope reduces accidental global writes while developing.
-- `clean_target.py` preserves `skills/.venv` to keep refresh runs fast.
+- Agents copied to top-level `agents/` (not `claudekit/agents/`) to match conversion function expectations.
+- `clean_target.py` deletes real `.venv` dirs (keeps symlinks) so re-symlink works on refresh.
+- Bootstrap skips pip install when venv is symlinked — packages already present.
 - Registry writes are defensive (`mkdir` before save) to avoid missing-path failures.
-- Bootstrap path prefers symlink reuse for speed; fallback path ensures portability.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudekit-codex-sync",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Sync ClaudeKit skills, agents, and config to Codex CLI",
   "main": "bin/ck-codex-sync.js",
   "bin": {

package/src/claudekit_codex_sync/asset_sync_dir.py

@@ -112,6 +112,28 @@ def sync_assets_from_dir(
         if registry and not dry_run and dst.exists():
             update_entry(registry, rel_path, src, dst)
 
+    # Copy agents directly to codex_home/agents/ (NOT claudekit/agents/)
+    # so convert_agents_md_to_toml() can find and convert them
+    agents_src = source / "agents"
+    if agents_src.exists():
+        agents_dst = codex_home / "agents"
+        if not dry_run:
+            agents_dst.mkdir(parents=True, exist_ok=True)
+        for src_file in sorted(agents_src.rglob("*.md")):
+            if not src_file.is_file():
+                continue
+            rel = src_file.relative_to(agents_src)
+            dst = agents_dst / rel
+            data = src_file.read_bytes()
+            changed, is_added = write_bytes_if_changed(dst, data, mode=None, dry_run=dry_run)
+            if changed:
+                if is_added:
+                    added += 1
+                    print(f"add: agents/{rel}")
+                else:
+                    updated += 1
+                    print(f"update: agents/{rel}")
+
     return {"added": added, "updated": updated, "removed": 0, "skipped": skipped}
 
 

package/src/claudekit_codex_sync/constants.py

@@ -2,8 +2,8 @@
 
 from typing import List, Set, Tuple
 
-ASSET_DIRS = {"commands", "output-styles", "scripts"}
-ASSET_FILES = {".env.example"}
+ASSET_DIRS = {"commands", "output-styles", "rules", "scripts"}
+ASSET_FILES = {".env.example", ".ck.json"}
 ASSET_MANIFEST = ".sync-manifest-assets.txt"
 PROMPT_MANIFEST = ".claudekit-generated-prompts.txt"
 REGISTRY_FILE = ".claudekit-sync-registry.json"