fix(codex): unify subscribed guideline storage

Author: visahak

platform-integrations/codex/plugins/evolve-lite/skills/recall/scripts/retrieve_entities.py

@@ -63,6 +63,8 @@ def load_entities_with_source(entities_dirs):
     for entities_dir in entities_dirs:
         entities_dir = Path(entities_dir)
         for md in sorted(entities_dir.glob("**/*.md")):
+            if md.is_symlink():
+                continue
             try:
                 entity = markdown_to_entity(md)
             except (OSError, UnicodeError):

platform-integrations/codex/plugins/evolve-lite/skills/subscribe/scripts/subscribe.py

@@ -36,8 +36,9 @@ def main():
 
     evolve_dir = Path(os.environ.get("EVOLVE_DIR", ".evolve"))
     project_root = str(evolve_dir.resolve()) if evolve_dir.name != ".evolve" else str(evolve_dir.resolve().parent)
-    subscribed_base = (evolve_dir / "subscribed").resolve()
-    dest = (evolve_dir / "subscribed" / args.name).resolve()
+    subscribed_base = (evolve_dir / "entities" / "subscribed").resolve()
+    dest = (evolve_dir / "entities" / "subscribed" / args.name).resolve()
+    legacy_dest = (evolve_dir / "subscribed" / args.name).resolve()
     if args.name in {"", "."} or dest == subscribed_base or not dest.is_relative_to(subscribed_base):
         print(f"Error: invalid subscription name: {args.name!r}", file=sys.stderr)
         sys.exit(1)
@@ -52,7 +53,7 @@ def main():
             print(f"Error: subscription '{args.name}' already exists in config.", file=sys.stderr)
             sys.exit(1)
 
-    if dest.exists():
+    if dest.exists() or legacy_dest.exists():
         print(f"Error: destination already exists: {dest}", file=sys.stderr)
         sys.exit(1)
     else:

platform-integrations/codex/plugins/evolve-lite/skills/sync/scripts/sync.py

@@ -3,7 +3,6 @@
 
 import argparse
 import os
-import shutil
 import subprocess
 import sys
 from pathlib import Path
@@ -37,19 +36,6 @@ def git_pull(repo_path, branch):
     )
 
 
-def copy_entities(subscribed_repo_path, entities_subscribed_path):
-    """Mirror .md files from the subscribed git clone into entities/subscribed/{name}/."""
-    if entities_subscribed_path.exists():
-        shutil.rmtree(entities_subscribed_path)
-    for md in sorted(subscribed_repo_path.glob("**/*.md")):
-        if md.is_symlink():
-            continue
-        rel = md.relative_to(subscribed_repo_path)
-        dest = entities_subscribed_path / rel
-        dest.parent.mkdir(parents=True, exist_ok=True)
-        shutil.copy2(md, dest)
-
-
 def count_delta(repo_path):
     """Count added, modified, and deleted markdown files since last pull."""
     result = subprocess.run(
@@ -123,13 +109,23 @@ def main():
             continue
         name = sub.get("name", "unknown")
         branch = sub.get("branch", "main")
-        subscribed_base = (evolve_dir / "subscribed").resolve()
-        repo_path = (evolve_dir / "subscribed" / name).resolve()
+        subscribed_base = (evolve_dir / "entities" / "subscribed").resolve()
+        repo_path = (evolve_dir / "entities" / "subscribed" / name).resolve()
+        legacy_base = (evolve_dir / "subscribed").resolve()
+        legacy_repo_path = (evolve_dir / "subscribed" / name).resolve()
 
         if repo_path == subscribed_base or not repo_path.is_relative_to(subscribed_base):
             summaries.append(f"{name} (invalid subscription name)")
             continue
 
+        if legacy_repo_path != legacy_base and legacy_repo_path.is_relative_to(legacy_base):
+            if legacy_repo_path.exists() and not repo_path.exists():
+                repo_path.parent.mkdir(parents=True, exist_ok=True)
+                legacy_repo_path.rename(repo_path)
+            elif legacy_repo_path.exists() and repo_path.exists():
+                summaries.append(f"{name} (duplicate subscription folders — remove .evolve/subscribed/{name})")
+                continue
+
         if not repo_path.is_dir():
             summaries.append(f"{name} (not cloned)")
             continue
@@ -146,9 +142,6 @@ def main():
         if any(value > 0 for value in delta.values()):
             any_changes = True
 
-        entities_subscribed = evolve_dir / "entities" / "subscribed" / name
-        copy_entities(repo_path, entities_subscribed)
-
         summaries.append(f"{name} (+{delta['added']} added, {delta['updated']} updated, {delta['removed']} removed)")
 
     audit_append(project_root=str(audit_root.parent), action="sync", actor=actor, delta=total_delta)

platform-integrations/codex/plugins/evolve-lite/skills/unsubscribe/scripts/unsubscribe.py

@@ -48,15 +48,15 @@ def main():
         return
 
     name = args.name
-    subscribed_base = (evolve_dir / "subscribed").resolve()
-    dest = (evolve_dir / "subscribed" / name).resolve()
+    subscribed_base = (evolve_dir / "entities" / "subscribed").resolve()
+    dest = (evolve_dir / "entities" / "subscribed" / name).resolve()
     if not dest.is_relative_to(subscribed_base):
         print(f"Error: invalid subscription name: {name!r}", file=sys.stderr)
         sys.exit(1)
 
-    entities_base = (evolve_dir / "entities" / "subscribed").resolve()
-    entities_dest = (evolve_dir / "entities" / "subscribed" / name).resolve()
-    if not entities_dest.is_relative_to(entities_base):
+    legacy_base = (evolve_dir / "subscribed").resolve()
+    legacy_dest = (evolve_dir / "subscribed" / name).resolve()
+    if not legacy_dest.is_relative_to(legacy_base):
         print(f"Error: invalid subscription name: {name!r}", file=sys.stderr)
         sys.exit(1)
 
@@ -71,9 +71,9 @@ def main():
     else:
         print(f"Warning: {dest} did not exist.", file=sys.stderr)
 
-    if entities_dest.exists():
-        shutil.rmtree(entities_dest)
-        print(f"Deleted {entities_dest}")
+    if legacy_dest.exists():
+        shutil.rmtree(legacy_dest)
+        print(f"Deleted {legacy_dest}")
 
     cfg["subscriptions"] = new_subs
     save_config(cfg, project_root)

tests/platform_integrations/test_codex_sharing.py

@@ -220,12 +220,13 @@ def test_subscribe_sync_and_unsubscribe_round_trip(self, temp_project_dir, local
             args=["--name", "alice", "--remote", str(local_repo["bare"]), "--branch", "main"],
             evolve_dir=evolve_dir,
         )
-        assert (evolve_dir / "subscribed" / "alice").is_dir()
+        assert (evolve_dir / "entities" / "subscribed" / "alice").is_dir()
+        assert not (evolve_dir / "subscribed" / "alice").exists()
 
         run_script(SYNC_SCRIPT, project_dir=temp_project_dir, evolve_dir=evolve_dir)
-        mirrored = evolve_dir / "entities" / "subscribed" / "alice" / "guideline" / "tip-one.md"
-        assert mirrored.exists()
-        assert "Always write tests." in mirrored.read_text()
+        synced = evolve_dir / "entities" / "subscribed" / "alice" / "guideline" / "tip-one.md"
+        assert synced.exists()
+        assert "Always write tests." in synced.read_text()
 
         run_script(
             UNSUBSCRIBE_SCRIPT,
@@ -283,7 +284,7 @@ def test_subscribe_rejects_empty_or_dot_name(self, temp_project_dir, local_repo,
 
     def test_subscribe_fails_when_destination_already_exists(self, temp_project_dir, local_repo):
         evolve_dir = temp_project_dir / ".evolve"
-        existing_dest = evolve_dir / "subscribed" / "alice"
+        existing_dest = evolve_dir / "entities" / "subscribed" / "alice"
         existing_dest.mkdir(parents=True)
 
         result = run_script(
@@ -393,7 +394,7 @@ def test_sync_skips_invalid_subscription_name(self, temp_project_dir):
 
     def test_sync_uses_workspace_config_with_custom_evolve_dir(self, temp_project_dir, local_repo):
         evolve_dir = temp_project_dir / "custom-evolve"
-        subscribed_dir = evolve_dir / "subscribed"
+        subscribed_dir = evolve_dir / "entities" / "subscribed"
         subscribed_dir.mkdir(parents=True)
         subprocess.run(
             ["git", "clone", "--branch", "main", "--depth", "1", str(local_repo["bare"]), str(subscribed_dir / "alice")],
@@ -450,6 +451,12 @@ def test_session_start_sync_respects_on_session_start_false(self, temp_project_d
             args=["--name", "alice", "--remote", str(local_repo["bare"]), "--branch", "main"],
             evolve_dir=evolve_dir,
         )
+        git_env = local_repo["env"]
+        new_entity = local_repo["work"] / "guideline" / "tip-two.md"
+        new_entity.write_text("---\ntype: guideline\n---\n\nDelete dead code promptly.\n")
+        subprocess.run(["git", "-C", str(local_repo["work"]), "add", "."], check=True, env=git_env)
+        subprocess.run(["git", "-C", str(local_repo["work"]), "commit", "-m", "add tip-two"], check=True, env=git_env)
+        subprocess.run(["git", "-C", str(local_repo["work"]), "push", "origin", "main"], check=True, env=git_env)
         (temp_project_dir / "evolve.config.yaml").write_text(
             f'subscriptions:\n  - name: "alice"\n    remote: "{local_repo["bare"]}"\n    branch: "main"\nsync:\n  on_session_start: false\n'
         )
@@ -463,8 +470,8 @@ def test_session_start_sync_respects_on_session_start_false(self, temp_project_d
         )
 
         assert result.returncode == 0
-        mirrored = evolve_dir / "entities" / "subscribed" / "alice" / "guideline" / "tip-one.md"
-        assert not mirrored.exists()
+        synced = evolve_dir / "entities" / "subscribed" / "alice" / "guideline" / "tip-two.md"
+        assert not synced.exists()
 
     def test_sync_writes_audit_log(self, temp_project_dir, local_repo):
         evolve_dir = temp_project_dir / ".evolve"
@@ -521,9 +528,20 @@ def test_sync_skips_symlinked_markdown_files(self, temp_project_dir, local_repo)
 
         run_script(SYNC_SCRIPT, project_dir=temp_project_dir, evolve_dir=evolve_dir)
 
-        mirrored_dir = evolve_dir / "entities" / "subscribed" / "alice" / "guideline"
-        assert (mirrored_dir / "tip-one.md").exists()
-        assert not (mirrored_dir / "tip-link.md").exists()
+        subscribed_dir = evolve_dir / "entities" / "subscribed" / "alice" / "guideline"
+        assert (subscribed_dir / "tip-one.md").exists()
+        assert (subscribed_dir / "tip-link.md").exists()
+
+        result = run_script(
+            RETRIEVE_SCRIPT,
+            project_dir=temp_project_dir,
+            evolve_dir=evolve_dir,
+            stdin=HOOK_INPUT,
+            expect_success=False,
+        )
+        assert result.returncode == 0
+        assert "Always write tests." in result.stdout
+        assert "tip-link" not in result.stdout
 
     def test_sync_removed_entity_disappears_after_sync(self, temp_project_dir, local_repo):
         evolve_dir = temp_project_dir / ".evolve"
@@ -545,3 +563,29 @@ def test_sync_removed_entity_disappears_after_sync(self, temp_project_dir, local
 
         run_script(SYNC_SCRIPT, project_dir=temp_project_dir, evolve_dir=evolve_dir)
         assert not tip_one.exists()
+
+    def test_sync_migrates_legacy_subscribed_repo(self, temp_project_dir, local_repo):
+        evolve_dir = temp_project_dir / ".evolve"
+        legacy_dir = evolve_dir / "subscribed"
+        legacy_dir.mkdir(parents=True)
+        subprocess.run(
+            ["git", "clone", "--branch", "main", "--depth", "1", str(local_repo["bare"]), str(legacy_dir / "alice")],
+            check=True,
+            env=local_repo["env"],
+        )
+        (temp_project_dir / "evolve.config.yaml").write_text(
+            f'subscriptions:\n  - name: "alice"\n    remote: "{local_repo["bare"]}"\n    branch: "main"\n'
+        )
+
+        result = run_script(
+            SYNC_SCRIPT,
+            project_dir=temp_project_dir,
+            evolve_dir=evolve_dir,
+            expect_success=False,
+        )
+
+        assert result.returncode == 0
+        migrated_repo = evolve_dir / "entities" / "subscribed" / "alice"
+        assert migrated_repo.is_dir()
+        assert not (evolve_dir / "subscribed" / "alice").exists()
+        assert (migrated_repo / "guideline" / "tip-one.md").exists()