fix(codex): harden sharing scripts and tests

Author: visahak

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

@@ -92,10 +92,8 @@ def main():
             log(f"Skipping duplicate: {content[:60]}")
             continue
 
-        if args.user and not entity.get("owner"):
-            entity["owner"] = args.user
-        if not entity.get("visibility"):
-            entity["visibility"] = "private"
+        entity["owner"] = args.user or "unknown"
+        entity["visibility"] = "private"
 
         path = write_entity_file(entities_dir, entity)
         existing_contents.add(normalize(content))

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

@@ -152,10 +152,14 @@ def main():
 
         pull_result = git_pull(repo_path, branch)
         if pull_result is None or pull_result.returncode != 0:
-            error_lines = (pull_result.stderr or pull_result.stdout or "").strip().splitlines()
-            short_error = error_lines[-1] if error_lines else "unknown error"
+            if pull_result is None:
+                short_error = "timeout"
+            else:
+                error_lines = (pull_result.stderr or pull_result.stdout or "").strip().splitlines()
+                short_error = error_lines[-1] if error_lines else f"git exited with {pull_result.returncode}"
             summaries.append(f"{name} (git pull failed: {short_error})")
             total_delta[name] = {"added": 0, "updated": 0, "removed": 0}
+            any_changes = True
             continue
 
         if "Already up to date" in (pull_result.stdout or ""):

tests/platform_integrations/test_codex.py

@@ -47,6 +47,7 @@ def _iter_group_hooks(group):
 
 
 @pytest.mark.platform_integrations
+@pytest.mark.e2e
 class TestCodexInstall:
     """Test the Codex install flow."""
 

tests/platform_integrations/test_codex_sharing.py

@@ -20,7 +20,7 @@
 HOOK_INPUT = json.dumps({"prompt": "How do I write clean code?"})
 
 
-def run_script(script, project_dir=None, args=None, evolve_dir=None, stdin=None, expect_success=True):
+def run_script(script, project_dir, args=None, evolve_dir=None, stdin=None, expect_success=True):
     env = {**os.environ}
     if evolve_dir:
         env["EVOLVE_DIR"] = str(evolve_dir)
@@ -29,7 +29,7 @@ def run_script(script, project_dir=None, args=None, evolve_dir=None, stdin=None,
         input=stdin,
         capture_output=True,
         text=True,
-        cwd=str(project_dir) if project_dir else None,
+        cwd=str(project_dir),
         env=env,
         check=expect_success,
     )
@@ -51,6 +51,34 @@ def test_save_stamps_owner_and_private_visibility(self, temp_project_dir):
         assert "owner: alice" in content
         assert "visibility: private" in content
 
+    def test_save_ignores_incoming_owner_and_visibility(self, temp_project_dir):
+        evolve_dir = temp_project_dir / ".evolve"
+        run_script(
+            SAVE_SCRIPT,
+            project_dir=temp_project_dir,
+            args=["--user", "alice"],
+            evolve_dir=evolve_dir,
+            stdin=json.dumps(
+                {
+                    "entities": [
+                        {
+                            "type": "guideline",
+                            "content": "Prefer small, reversible changes.",
+                            "owner": "mallory",
+                            "visibility": "public",
+                        }
+                    ]
+                }
+            ),
+        )
+        files = list((evolve_dir / "entities" / "guideline").glob("*.md"))
+        assert len(files) == 1
+        content = files[0].read_text()
+        assert "owner: alice" in content
+        assert "owner: mallory" not in content
+        assert "visibility: private" in content
+        assert "visibility: public" not in content
+
     def test_retrieve_annotates_subscribed_entities(self, temp_project_dir):
         evolve_dir = temp_project_dir / ".evolve"
         own_dir = evolve_dir / "entities" / "guideline"
@@ -60,7 +88,13 @@ def test_retrieve_annotates_subscribed_entities(self, temp_project_dir):
         sub_dir.mkdir(parents=True)
         (sub_dir / "alice-tip.md").write_text("---\ntype: guideline\nowner: alice\nvisibility: public\n---\n\nAlways write tests.\n")
 
-        result = run_script(RETRIEVE_SCRIPT, evolve_dir=evolve_dir, stdin=HOOK_INPUT, expect_success=False)
+        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 "Keep functions small." in result.stdout
         assert "[from: alice]" in result.stdout
@@ -77,7 +111,13 @@ def test_retrieve_includes_published_guidelines(self, temp_project_dir):
             "---\ntype: guideline\nvisibility: public\nsource: alice/evolve-guidelines\n---\n\nDocument edge cases.\n"
         )
 
-        result = run_script(RETRIEVE_SCRIPT, evolve_dir=evolve_dir, stdin=HOOK_INPUT, expect_success=False)
+        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 "Keep functions small." in result.stdout
         assert "Document edge cases." in result.stdout

tests/platform_integrations/test_entity_io_core.py

@@ -15,7 +15,7 @@
 )
 import entity_io
 
-pytestmark = pytest.mark.platform_integrations
+pytestmark = [pytest.mark.platform_integrations, pytest.mark.unit]
 
 
 class TestSlugify:

tests/platform_integrations/test_subscribe.py

@@ -14,7 +14,7 @@
 )
 import config as cfg_module
 
-pytestmark = pytest.mark.platform_integrations
+pytestmark = [pytest.mark.platform_integrations, pytest.mark.e2e]
 
 _PLUGIN_ROOT = Path(__file__).parent.parent.parent / "platform-integrations/claude/plugins/evolve-lite"
 SUBSCRIBE_SCRIPT = _PLUGIN_ROOT / "skills/subscribe/scripts/subscribe.py"

tests/platform_integrations/test_sync.py

@@ -142,7 +142,7 @@ def test_skips_invalid_subscription_name(self, temp_project_dir):
         result = run_script(SYNC_SCRIPT, temp_project_dir, evolve_dir=evolve_dir)
         assert result.returncode == 0
         assert "invalid subscription name" in result.stdout
-        assert not (evolve_dir / "subscribed" / ".." / "evil").exists()
+        assert not (evolve_dir / "entities" / "evil").exists()
 
     def test_manual_run_ignores_on_session_start_false(self, subscribed_project):
         p = subscribed_project