codex-agent-framework 0.1.61__tar.gz → 0.1.63__tar.gz

{codex_agent_framework-0.1.61/codex_agent_framework.egg-info → codex_agent_framework-0.1.63}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-agent-framework
-Version: 0.1.61
+Version: 0.1.63
 Summary: A lightweight event-driven Codex agent runtime.
 Author: Baptiste
 License-Expression: MIT

{codex_agent_framework-0.1.61 → codex_agent_framework-0.1.63}/codex_agent/agent_runtime.py

@@ -427,7 +427,7 @@ class ProcessAgentRuntime(AgentRuntime):
             return None
         try:
             return message_from_data(message)
-        except Exception:
+        except (TypeError, ValueError):
             return modict(message)
 
     def is_cached_wrapper(self, message):

{codex_agent_framework-0.1.61 → codex_agent_framework-0.1.63}/codex_agent/cli/headless.py

@@ -1,7 +1,8 @@
-import json
 import sys
 import threading
 
+from codex_agent.config import parse_config_value
+
 from .output import dump_ndjson, output_payload, key_value_text
 from .runner import in_process_runner, process_runner, server_runner
 
@@ -71,21 +72,6 @@ def run_tools(args, extra_args=None):
     return payload
 
 
-def parse_config_value(value):
-    text = str(value)
-    lowered = text.lower()
-    if lowered == "true":
-        return True
-    if lowered == "false":
-        return False
-    if lowered == "null" or lowered == "none":
-        return None
-    try:
-        return json.loads(text)
-    except json.JSONDecodeError:
-        return value
-
-
 def parse_config_set_args(extra_args):
     args = list(extra_args or [])
     if not args:

{codex_agent_framework-0.1.61 → codex_agent_framework-0.1.63}/codex_agent/command.py

@@ -33,6 +33,7 @@ def command(func=None, **options):
 
 
 def command_options(func):
+    """Return command decorator options from a function or bound method."""
     options = getattr(func, COMMAND_MARKER, None)
     if options is not None:
         return options

{codex_agent_framework-0.1.61 → codex_agent_framework-0.1.63}/codex_agent/config.py

@@ -17,6 +17,7 @@ DEFAULT_COMPACTION_PROMPT = text_content(DEFAULT_COMPACTION_PROMPT_PATH)
 
 
 def parse_config_value(value):
+    """Parse CLI/config scalar strings into bool, null, numeric, or JSON values."""
     if isinstance(value, bool):
         return value
     if not isinstance(value, str):

{codex_agent_framework-0.1.61 → codex_agent_framework-0.1.63}/codex_agent/service.py

@@ -11,15 +11,18 @@ from .utils import project_python_env, runtime_join
 
 SERVER_SERVICE_NAME = "codex-agent.service"
 TRAY_SERVICE_NAME = "codex-agent-tray.service"
+# Backwards-compatible alias for callers that predate the tray/server split.
 SERVICE_NAME = SERVER_SERVICE_NAME
 RESTART_WAKEUP_FILE = "restart_wakeup.json"
 
 
 def restart_wakeup_file():
+    """Return the runtime file used to resume work after a service restart."""
     return Path(runtime_join(RESTART_WAKEUP_FILE))
 
 
 def write_restart_wakeup(prompt, title=""):
+    """Persist a prompt for the next server startup to consume as a wakeup."""
     if not prompt or not str(prompt).strip():
         raise ValueError("prompt must not be empty")
     path = restart_wakeup_file()
@@ -33,6 +36,7 @@ def write_restart_wakeup(prompt, title=""):
 
 
 def pop_restart_wakeup():
+    """Read and remove any pending post-restart wakeup payload."""
     path = restart_wakeup_file()
     if not path.is_file():
         return None
@@ -47,6 +51,7 @@ def pop_restart_wakeup():
 
 
 def restart_server_service(check=False):
+    """Restart only the local server service without blocking the caller."""
     return service_controller().restart(SERVER_SERVICE_NAME, check=check, no_block=True)
 
 

{codex_agent_framework-0.1.61 → codex_agent_framework-0.1.63}/codex_agent/stream_utils.py

@@ -6,12 +6,6 @@ import re
 from typing import Union
 import json
 
-def log(*data):
-    if False:
-        print(*data)
-        input()
-
-
 class END:
     #sentinel value for end of stream
     pass
@@ -376,7 +370,7 @@ class XMLExtractor(Extractor):
             try:
                 # JSON-compatible values: numbers, booleans, null, dicts, lists…
                 value = json.loads(raw)
-            except Exception:
+            except ValueError:
                 # else keep raw string
                 value = raw
 
@@ -455,7 +449,7 @@ class MarkdownBlockExtractor(Extractor):
             raw_val = m.group("qvalue") or m.group("uvalue") or ""
             try:
                 value = json.loads(raw_val)
-            except Exception:
+            except ValueError:
                 value = raw_val
             result[name] = value
 

{codex_agent_framework-0.1.61 → codex_agent_framework-0.1.63}/codex_agent/utils.py

@@ -262,6 +262,7 @@ def truncate(string, max_tokens=2000, start_line=1, model=None):
     return result
 
 def pack_msgs(messages):
+    """Format named text messages into a compact transcript string."""
     return "".join(f"{message.name}:\n{message.content.strip()}\n\n" for message in messages)
 
 def msg_token_count(msg, model=None):
@@ -318,36 +319,31 @@ def split_history_turns(messages):
     return turns, current
 
 def find_pattern(text, pattern=None):
-    """
-    Renvoie une liste de tuples contenant TOUS les groupes capturés par le pattern.
+    """Return captured regex groups for every match in ``text``.
 
-    - Si le pattern contient 1 groupe  -> tuple de 1 élément
-    - Si le pattern contient n groupes -> tuple de n éléments
+    The default pattern extracts fenced Python code blocks. Each result is a
+    tuple containing all capture groups for one match, even when there is only
+    one group.
     """
-
     pattern = pattern or r'```python(.*?)```'
     iterator = re.finditer(pattern, text, re.DOTALL)
-
-    return [
-        tuple(match.groups())     # groups() renvoie *tous* les groupes capturés
-        for match in iterator
-    ]
+    return [tuple(match.groups()) for match in iterator]
 
 def format(string, context=None):
-    # Si aucun contexte n'est fourni, utiliser un dictionnaire vide
-    if context is None:
-        context = {}
-    # Trouver les expressions entre <<...>>
+    """Interpolate ``<<expr>>`` fragments with values evaluated from ``context``.
+
+    Expressions that fail to evaluate are left unchanged. This helper is meant
+    for trusted templates only because expressions are evaluated with ``eval``.
+    """
+    context = {} if context is None else context
+
     def replace_expr(match):
         expr = match.group(1)
         try:
-            # Évaluer l'expression dans le contexte donné et la convertir en chaîne
             return str(eval(expr, context))
         except Exception:
-            # print(f"could not evaluate expr: {expr}\n Exception:\n {str(e)}")
-            # En cas d'erreur, retourner l'expression non évaluée
-            return '<<' + expr + '>>'
-    # Remplacer chaque expression par son évaluation
+            return f"<<{expr}>>"
+
     return re.sub(r'<<(.*?)>>', replace_expr, string)
 
 def timestamp(digits=3):

codex_agent_framework-0.1.63/codex_agent/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.63"

{codex_agent_framework-0.1.61 → codex_agent_framework-0.1.63/codex_agent_framework.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-agent-framework
-Version: 0.1.61
+Version: 0.1.63
 Summary: A lightweight event-driven Codex agent runtime.
 Author: Baptiste
 License-Expression: MIT

{codex_agent_framework-0.1.61 → codex_agent_framework-0.1.63}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "codex-agent-framework"
-version = "0.1.61"
+version = "0.1.63"
 description = "A lightweight event-driven Codex agent runtime."
 readme = "README.md"
 requires-python = ">=3.11"

{codex_agent_framework-0.1.61 → codex_agent_framework-0.1.63}/tests/test_agent_runtime.py

@@ -3,6 +3,7 @@ from types import SimpleNamespace
 from modict import modict
 
 from codex_agent.agent_runtime import AgentRuntime, ProcessAgentRuntime
+from codex_agent.message import UserMessage
 
 
 class FakeRuntime(AgentRuntime):
@@ -119,6 +120,24 @@ def test_runtime_submit_prompt_routes_text_to_submit_message():
     assert runtime.messages[-1].content == "hello"
 
 
+def test_process_runtime_cached_message_from_event_rehydrates_known_messages():
+    runtime = ProcessAgentRuntime()
+
+    message = runtime.cached_message_from_event({"type": "user_message", "content": "hello"})
+
+    assert isinstance(message, UserMessage)
+    assert message.content == "hello"
+
+
+def test_process_runtime_cached_message_from_event_keeps_unknown_payloads_as_modict():
+    runtime = ProcessAgentRuntime()
+
+    message = runtime.cached_message_from_event({"type": "future_message", "content": "hello"})
+
+    assert isinstance(message, modict)
+    assert message == {"type": "future_message", "content": "hello"}
+
+
 def test_process_runtime_update_config_preserves_namespace_cache_boundary(monkeypatch):
     runtime = ProcessAgentRuntime()
     runtime.cache["config"] = modict(model="cached")

{codex_agent_framework-0.1.61 → codex_agent_framework-0.1.63}/tests/test_builtin_config.py

@@ -1,4 +1,4 @@
-from codex_agent.config import ConfigManager
+from codex_agent.config import ConfigManager, parse_config_value
 
 
 class DummyAgent:
@@ -12,6 +12,35 @@ def manager_with_builtin_field(field, value):
     return manager
 
 
+def test_parse_config_value_handles_cli_scalars_and_json():
+    cases = {
+        "true": True,
+        "yes": True,
+        "on": True,
+        "1": True,
+        "false": False,
+        "no": False,
+        "off": False,
+        "0": False,
+        "none": None,
+        "null": None,
+        "128": 128,
+        "-7": -7,
+        "3.5": 3.5,
+        "1e3": 1000.0,
+        '{"model":"test"}': {"model": "test"},
+        '["memory"]': ["memory"],
+    }
+    for raw, expected in cases.items():
+        assert parse_config_value(raw) == expected
+
+
+def test_parse_config_value_preserves_unknown_strings_and_values():
+    assert parse_config_value("gpt-test") == "gpt-test"
+    assert parse_config_value(True) is True
+    assert parse_config_value({"already": "parsed"}) == {"already": "parsed"}
+
+
 def test_builtin_plugin_enabled_none_loads_everything():
     manager = manager_with_builtin_field("builtin_plugins", None)
 

{codex_agent_framework-0.1.61 → codex_agent_framework-0.1.63}/tests/test_cli_headless.py

@@ -1,4 +1,6 @@
 import importlib
+import json
+
 cli_main = importlib.import_module("codex_agent.cli.main")
 headless = importlib.import_module("codex_agent.cli.headless")
 runner = importlib.import_module("codex_agent.cli.runner")
@@ -99,6 +101,30 @@ def test_config_get_key(monkeypatch, capsys):
     assert capsys.readouterr().out.strip() == "test-model"
 
 
+def test_config_set_key_value_parses_central_config_scalars(monkeypatch, capsys):
+    patch_client(monkeypatch)
+
+    cli_main.main([
+        "config",
+        "set",
+        "enabled",
+        "yes",
+        "limit",
+        "128000",
+        "disabled",
+        "off",
+        "plugins",
+        '["memory"]',
+        "--json",
+    ])
+
+    payload = json.loads(capsys.readouterr().out)
+    assert payload["enabled"] is True
+    assert payload["limit"] == 128000
+    assert payload["disabled"] is False
+    assert payload["plugins"] == ["memory"]
+
+
 def test_config_set_key_value(monkeypatch, capsys):
     patch_client(monkeypatch)
 

{codex_agent_framework-0.1.61 → codex_agent_framework-0.1.63}/tests/test_service.py

@@ -1,6 +1,10 @@
 from codex_agent import service
 
 
+def test_service_name_alias_points_to_server_service_for_compatibility():
+    assert service.SERVICE_NAME == service.SERVER_SERVICE_NAME
+
+
 def test_install_user_service_writes_server_and_tray_units(tmp_path, monkeypatch):
     calls = []
     monkeypatch.setenv("HOME", str(tmp_path))

{codex_agent_framework-0.1.61 → codex_agent_framework-0.1.63}/tests/test_utils.py

@@ -6,7 +6,7 @@ from PIL import Image as PILImage
 from codex_agent.message import AssistantMessage, CompactionMessage, DeveloperMessage, InterruptMessage, ServerToolResponseMessage, ToolResultMessage, UserMessage
 from codex_agent import utils
 from codex_agent.image import ImageMessage, image_input_token_count
-from codex_agent.stream_utils import MappingStreamProcessor, MappingStreamSplitter, Splitter, Tee, fenced
+from codex_agent.stream_utils import MarkdownBlockExtractor, MappingStreamProcessor, MappingStreamSplitter, Splitter, Tee, XMLExtractor, fenced
 from codex_agent.utils import split_history_turns
 from codex_agent.utils import project_python_env
 
@@ -43,6 +43,26 @@ def test_pack_msgs_formats_named_messages():
     assert utils.pack_msgs(messages) == "user:\nhello\n\nassistant:\ndone\n\n"
 
 
+def test_find_pattern_returns_capture_groups_for_default_python_fences():
+    text = "before\n```python\nprint('hello')\n```\nafter"
+
+    assert utils.find_pattern(text) == [("\nprint('hello')\n",)]
+
+
+def test_find_pattern_returns_all_capture_groups_for_custom_pattern():
+    text = "ticket ABC-123 and ticket XYZ-999"
+
+    assert utils.find_pattern(text, r"ticket ([A-Z]+)-(\d+)") == [("ABC", "123"), ("XYZ", "999")]
+
+
+def test_format_interpolates_trusted_expressions_from_context():
+    assert utils.format("hello <<name.upper()>> #<<count + 1>>", {"name": "pandora", "count": 2}) == "hello PANDORA #3"
+
+
+def test_format_keeps_expression_placeholder_when_evaluation_fails():
+    assert utils.format("hello <<missing + 1>>") == "hello <<missing + 1>>"
+
+
 def test_logger_creates_parent_directory_and_truncates_file(tmp_path):
     log_file = tmp_path / "logs" / "log.txt"
 
@@ -83,6 +103,18 @@ def test_mapping_stream_splitter_can_be_reused():
     assert list(second["text"]) == ["b"]
 
 
+def test_xml_extractor_parse_attrs_preserves_invalid_json_values():
+    attrs = XMLExtractor.parse_attrs('count=3 raw={oops label="hello" enabled=true')
+
+    assert attrs == {"count": 3, "raw": "{oops", "label": "hello", "enabled": True}
+
+
+def test_markdown_block_extractor_parse_kwargs_preserves_invalid_json_values():
+    kwargs = MarkdownBlockExtractor.parse_kwargs('count=3, raw={oops, label="hello", enabled=true')
+
+    assert kwargs == {"count": 3, "raw": "{oops", "label": "hello", "enabled": True}
+
+
 def test_mapping_stream_processor_is_direct_passthrough_without_processors():
     source = iter([{"content": "a"}, {"content": "b"}])
     processor = MappingStreamProcessor(processors={"content": []}, threaded=True)

codex_agent_framework-0.1.61/codex_agent/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.61"