codexed 0.1.0__tar.gz → 0.1.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {codexed-0.1.0 → codexed-0.1.1}/PKG-INFO +1 -1
- {codexed-0.1.0 → codexed-0.1.1}/pyproject.toml +1 -1
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/client.py +34 -3
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/request_params.py +32 -2
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/responses.py +8 -0
- {codexed-0.1.0 → codexed-0.1.1}/LICENSE +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/README.md +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/README.md +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/__init__.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/exceptions.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/helpers.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/log.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/__init__.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/base.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/codex_types.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/command_action.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/event_data.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/events.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/fuzzy_search.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/hooks.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/mcp_server.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/misc.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/realtime.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/response_item.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/terminal.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/thread_item.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/thread_status.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/token_usage.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/tool_config.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/user_input.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/models/web_search.py +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/py.typed +0 -0
- {codexed-0.1.0 → codexed-0.1.1}/src/codexed/request_handlers.py +0 -0
|
@@ -378,6 +378,7 @@ class CodexClient:
|
|
|
378
378
|
on_user_input: UserInputHandler | None = None,
|
|
379
379
|
on_dynamic_tool_call: DynamicToolCallHandler | None = None,
|
|
380
380
|
on_mcp_elicitation: McpElicitationHandler | None = None,
|
|
381
|
+
mcp_elicitation_for_approvals: bool = False,
|
|
381
382
|
) -> None:
|
|
382
383
|
"""Initialize the Codex app-server client.
|
|
383
384
|
|
|
@@ -392,6 +393,13 @@ class CodexClient:
|
|
|
392
393
|
on_user_input: Handler for tool user input requests.
|
|
393
394
|
on_dynamic_tool_call: Handler for dynamic tool call requests.
|
|
394
395
|
on_mcp_elicitation: Handler for MCP elicitation requests.
|
|
396
|
+
mcp_elicitation_for_approvals: If True, enables the Codex
|
|
397
|
+
``tool_call_mcp_elicitation`` feature flag which routes MCP tool
|
|
398
|
+
approval prompts through ``mcpServer/elicitation/request`` instead
|
|
399
|
+
of ``item/tool/requestUserInput``. Requires *on_mcp_elicitation*
|
|
400
|
+
to handle approvals (the schema is empty; context is in ``_meta``).
|
|
401
|
+
Default is False because the default elicitation handler auto-declines,
|
|
402
|
+
which would break MCP tool approvals.
|
|
395
403
|
"""
|
|
396
404
|
self._codex_command = codex_command
|
|
397
405
|
self._profile = profile
|
|
@@ -405,6 +413,8 @@ class CodexClient:
|
|
|
405
413
|
self._reader_task: asyncio.Task[None] | None = None
|
|
406
414
|
self._writer_lock = asyncio.Lock()
|
|
407
415
|
self._active_threads: set[str] = set()
|
|
416
|
+
self._mcp_elicitation_enabled = on_mcp_elicitation is not None
|
|
417
|
+
self._mcp_elicitation_for_approvals = mcp_elicitation_for_approvals
|
|
408
418
|
self._server_request_handlers: dict[str, ServerRequestHandler] = {}
|
|
409
419
|
if on_approval:
|
|
410
420
|
self.register_handler(SERVER_REQUEST_COMMAND_APPROVAL, on_approval) # type: ignore[arg-type]
|
|
@@ -502,6 +512,7 @@ class CodexClient:
|
|
|
502
512
|
tools: list[ToolConfig] | None,
|
|
503
513
|
code_mode: bool | None,
|
|
504
514
|
mcp_servers: Mapping[str, McpServerConfig] | None = None,
|
|
515
|
+
mcp_elicitation_for_approvals: bool = False,
|
|
505
516
|
) -> dict[str, Any] | None:
|
|
506
517
|
"""Merge tools, code_mode, and mcp_servers into a config dict."""
|
|
507
518
|
merged = dict(config) if config else {}
|
|
@@ -509,6 +520,8 @@ class CodexClient:
|
|
|
509
520
|
merged.setdefault("features", {})["code_mode"] = code_mode
|
|
510
521
|
merged.setdefault("features", {})["codex_hooks"] = True
|
|
511
522
|
merged.setdefault("features", {})["realtime_conversation"] = True
|
|
523
|
+
if mcp_elicitation_for_approvals:
|
|
524
|
+
merged.setdefault("features", {})["tool_call_mcp_elicitation"] = True
|
|
512
525
|
if tools is not None:
|
|
513
526
|
from codexed.models.tool_config import tools_to_config_dict
|
|
514
527
|
|
|
@@ -574,7 +587,13 @@ class CodexClient:
|
|
|
574
587
|
developer_instructions=developer_instructions,
|
|
575
588
|
approval_policy=approval_policy,
|
|
576
589
|
sandbox=sandbox,
|
|
577
|
-
config=self._merge_config(
|
|
590
|
+
config=self._merge_config(
|
|
591
|
+
config,
|
|
592
|
+
tools,
|
|
593
|
+
code_mode,
|
|
594
|
+
mcp_servers,
|
|
595
|
+
mcp_elicitation_for_approvals=self._mcp_elicitation_for_approvals,
|
|
596
|
+
),
|
|
578
597
|
service_name=service_name,
|
|
579
598
|
personality=personality,
|
|
580
599
|
ephemeral=ephemeral,
|
|
@@ -633,7 +652,13 @@ class CodexClient:
|
|
|
633
652
|
developer_instructions=developer_instructions,
|
|
634
653
|
approval_policy=approval_policy,
|
|
635
654
|
sandbox=sandbox,
|
|
636
|
-
config=self._merge_config(
|
|
655
|
+
config=self._merge_config(
|
|
656
|
+
config,
|
|
657
|
+
tools,
|
|
658
|
+
code_mode,
|
|
659
|
+
mcp_servers,
|
|
660
|
+
mcp_elicitation_for_approvals=self._mcp_elicitation_for_approvals,
|
|
661
|
+
),
|
|
637
662
|
personality=personality,
|
|
638
663
|
)
|
|
639
664
|
result = await self._send_request("thread/resume", params)
|
|
@@ -692,7 +717,13 @@ class CodexClient:
|
|
|
692
717
|
developer_instructions=developer_instructions,
|
|
693
718
|
approval_policy=approval_policy,
|
|
694
719
|
sandbox=sandbox,
|
|
695
|
-
config=self._merge_config(
|
|
720
|
+
config=self._merge_config(
|
|
721
|
+
config,
|
|
722
|
+
tools,
|
|
723
|
+
code_mode,
|
|
724
|
+
mcp_servers,
|
|
725
|
+
mcp_elicitation_for_approvals=self._mcp_elicitation_for_approvals,
|
|
726
|
+
),
|
|
696
727
|
personality=personality,
|
|
697
728
|
)
|
|
698
729
|
result = await self._send_request("thread/fork", params)
|
|
@@ -521,6 +521,26 @@ class _McpElicitationBase(CodexBaseModel):
|
|
|
521
521
|
turn_id: str | None = None
|
|
522
522
|
server_name: str
|
|
523
523
|
meta: Any | None = None
|
|
524
|
+
"""Optional metadata from the server.
|
|
525
|
+
|
|
526
|
+
For MCP tool approval requests (when ``tool_call_mcp_elicitation`` is enabled),
|
|
527
|
+
this contains:
|
|
528
|
+
|
|
529
|
+
- ``kind`` (str): Always ``"mcp_tool_call"`` for tool approvals.
|
|
530
|
+
- ``persist`` (str | list[str]): Allowed persistence options —
|
|
531
|
+
``"session"`` (remember for this session) and/or ``"always"``
|
|
532
|
+
(remember permanently).
|
|
533
|
+
- ``tool_title`` (str, optional): Human-readable tool name.
|
|
534
|
+
- ``tool_description`` (str, optional): Tool description.
|
|
535
|
+
- ``tool_params`` (dict, optional): The tool call arguments.
|
|
536
|
+
- ``tool_params_display`` (list, optional): Rendered parameter display.
|
|
537
|
+
- ``source`` (str, optional): ``"connector"`` if from a ChatGPT App.
|
|
538
|
+
- ``connector_id``, ``connector_name``, ``connector_description``
|
|
539
|
+
(str, optional): Connector details when source is ``"connector"``.
|
|
540
|
+
|
|
541
|
+
For regular MCP server elicitations (auth flows etc.), the meta content
|
|
542
|
+
is defined by the MCP server itself.
|
|
543
|
+
"""
|
|
524
544
|
message: str
|
|
525
545
|
|
|
526
546
|
|
|
@@ -531,10 +551,13 @@ class McpElicitationFormParams(_McpElicitationBase):
|
|
|
531
551
|
requested_schema: dict[str, Any]
|
|
532
552
|
|
|
533
553
|
def to_mcp(self) -> mcp.types.ElicitRequestFormParams:
|
|
534
|
-
|
|
554
|
+
params = mcp.types.ElicitRequestFormParams(
|
|
535
555
|
message=self.message,
|
|
536
556
|
requestedSchema=self.requested_schema,
|
|
537
557
|
)
|
|
558
|
+
if self.meta is not None:
|
|
559
|
+
params.meta = mcp.types.RequestParams.Meta(**self.meta)
|
|
560
|
+
return params
|
|
538
561
|
|
|
539
562
|
@classmethod
|
|
540
563
|
def from_mcp(
|
|
@@ -545,9 +568,11 @@ class McpElicitationFormParams(_McpElicitationBase):
|
|
|
545
568
|
turn_id: str | None = None,
|
|
546
569
|
) -> McpElicitationFormParams:
|
|
547
570
|
"""Create from MCP ElicitRequestFormParams."""
|
|
571
|
+
meta = params.meta.model_dump(exclude={"progressToken"}) if params.meta else None
|
|
548
572
|
return cls(
|
|
549
573
|
message=params.message,
|
|
550
574
|
requested_schema=dict(params.requestedSchema),
|
|
575
|
+
meta=meta,
|
|
551
576
|
thread_id=thread_id,
|
|
552
577
|
server_name=server_name,
|
|
553
578
|
turn_id=turn_id,
|
|
@@ -562,11 +587,14 @@ class McpElicitationUrlParams(_McpElicitationBase):
|
|
|
562
587
|
elicitation_id: str
|
|
563
588
|
|
|
564
589
|
def to_mcp(self) -> mcp.types.ElicitRequestURLParams:
|
|
565
|
-
|
|
590
|
+
params = mcp.types.ElicitRequestURLParams(
|
|
566
591
|
message=self.message,
|
|
567
592
|
url=self.url,
|
|
568
593
|
elicitationId=self.elicitation_id,
|
|
569
594
|
)
|
|
595
|
+
if self.meta is not None:
|
|
596
|
+
params.meta = mcp.types.RequestParams.Meta(**self.meta)
|
|
597
|
+
return params
|
|
570
598
|
|
|
571
599
|
@classmethod
|
|
572
600
|
def from_mcp(
|
|
@@ -577,10 +605,12 @@ class McpElicitationUrlParams(_McpElicitationBase):
|
|
|
577
605
|
turn_id: str | None = None,
|
|
578
606
|
) -> McpElicitationUrlParams:
|
|
579
607
|
"""Create from MCP ElicitRequestURLParams."""
|
|
608
|
+
meta = params.meta.model_dump(exclude={"progressToken"}) if params.meta else None
|
|
580
609
|
return cls(
|
|
581
610
|
message=params.message,
|
|
582
611
|
url=params.url,
|
|
583
612
|
elicitation_id=params.elicitationId,
|
|
613
|
+
meta=meta,
|
|
584
614
|
thread_id=thread_id,
|
|
585
615
|
server_name=server_name,
|
|
586
616
|
turn_id=turn_id,
|
|
@@ -62,6 +62,14 @@ class McpServerElicitationResponse(CodexBaseModel):
|
|
|
62
62
|
action: Literal["accept", "decline", "cancel"]
|
|
63
63
|
content: Any | None = None
|
|
64
64
|
meta: Any | None = None
|
|
65
|
+
"""Optional metadata to include in the response.
|
|
66
|
+
|
|
67
|
+
For MCP tool approval responses, this can contain:
|
|
68
|
+
|
|
69
|
+
- ``persist`` (str): ``"session"`` to remember the approval for
|
|
70
|
+
the current session, or ``"always"`` to remember permanently.
|
|
71
|
+
Must be one of the options listed in the request's ``meta.persist``.
|
|
72
|
+
"""
|
|
65
73
|
|
|
66
74
|
def to_mcp(self) -> mcp.types.ElicitResult:
|
|
67
75
|
return mcp.types.ElicitResult(action=self.action, content=self.content)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|