codexed 1.1.7__tar.gz → 1.1.8__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-1.1.7 → codexed-1.1.8}/PKG-INFO +2 -1
- {codexed-1.1.7 → codexed-1.1.8}/pyproject.toml +2 -1
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/client/client.py +1 -1
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/client/session.py +46 -5
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/models/__init__.py +1 -7
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/models/misc.py +6 -88
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/models/responses.py +0 -14
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/models/thread_item.py +1 -2
- {codexed-1.1.7 → codexed-1.1.8}/LICENSE +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/README.md +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/README.md +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/__init__.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/client/__init__.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/client/dispatch.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/client/fs.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/client/realtime.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/client/skills.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/exceptions.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/helpers.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/log.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/models/base.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/models/codex_types.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/models/event_data.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/models/events.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/models/mcp_server.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/models/request_params.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/models/tool_config.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/models/user_input.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/models/v2_protocol.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/py.typed +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/request_handlers.py +0 -0
- {codexed-1.1.7 → codexed-1.1.8}/src/codexed/transport.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: codexed
|
|
3
|
-
Version: 1.1.
|
|
3
|
+
Version: 1.1.8
|
|
4
4
|
Summary: Alternative codex app-server client
|
|
5
5
|
Keywords:
|
|
6
6
|
Author: Philipp Temminghoff
|
|
@@ -22,6 +22,7 @@ Classifier: Topic :: Software Development
|
|
|
22
22
|
Classifier: Topic :: Utilities
|
|
23
23
|
Classifier: Typing :: Typed
|
|
24
24
|
Requires-Dist: anyenv>=2.0.15
|
|
25
|
+
Requires-Dist: mcp>=1.27.0
|
|
25
26
|
Requires-Dist: pydantic
|
|
26
27
|
Requires-Dist: schemez
|
|
27
28
|
Requires-Dist: websockets>=13.0 ; extra == 'websocket'
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
[project]
|
|
4
4
|
name = "codexed"
|
|
5
|
-
version = "1.1.
|
|
5
|
+
version = "1.1.8"
|
|
6
6
|
description = "Alternative codex app-server client"
|
|
7
7
|
readme = "README.md"
|
|
8
8
|
requires-python = ">=3.13"
|
|
@@ -30,6 +30,7 @@ classifiers = [
|
|
|
30
30
|
]
|
|
31
31
|
dependencies = [
|
|
32
32
|
"anyenv>=2.0.15",
|
|
33
|
+
"mcp>=1.27.0",
|
|
33
34
|
"pydantic",
|
|
34
35
|
"schemez",
|
|
35
36
|
# Only add below (Copier)
|
|
@@ -651,7 +651,7 @@ class CodexClient:
|
|
|
651
651
|
)
|
|
652
652
|
params = TypeAdapter[LoginAccountParams](LoginAccountParams).validate_python(dct)
|
|
653
653
|
result = await self.dispatch.send_request("account/login/start", params)
|
|
654
|
-
return LoginAccountResponse.
|
|
654
|
+
return TypeAdapter[LoginAccountResponse](LoginAccountResponse).validate_python(result)
|
|
655
655
|
|
|
656
656
|
async def account_login_cancel(self, login_id: str) -> CancelLoginAccountStatus:
|
|
657
657
|
"""Cancel an in-progress account login."""
|
|
@@ -197,12 +197,12 @@ class Session:
|
|
|
197
197
|
case ErrorMessage(data=ErrorNotification(error=error)):
|
|
198
198
|
yield event
|
|
199
199
|
raise TurnFailedError(error.message, turn_id=turn_id)
|
|
200
|
+
case ThreadTokenUsageUpdatedEvent(
|
|
201
|
+
data=ThreadTokenUsageUpdatedNotification(token_usage=usage)
|
|
202
|
+
):
|
|
203
|
+
self.usage = usage
|
|
204
|
+
yield event
|
|
200
205
|
case _:
|
|
201
|
-
match event:
|
|
202
|
-
case ThreadTokenUsageUpdatedEvent(
|
|
203
|
-
data=ThreadTokenUsageUpdatedNotification(token_usage=usage)
|
|
204
|
-
):
|
|
205
|
-
self.usage = usage
|
|
206
206
|
yield event
|
|
207
207
|
finally:
|
|
208
208
|
if turn_key in self._client._turn_queues:
|
|
@@ -422,6 +422,47 @@ class Session:
|
|
|
422
422
|
result = await self._client.dispatch.send_request("review/start", params)
|
|
423
423
|
return ReviewStartResponse.model_validate(result)
|
|
424
424
|
|
|
425
|
+
async def review_stream(
|
|
426
|
+
self,
|
|
427
|
+
target: ReviewTarget,
|
|
428
|
+
*,
|
|
429
|
+
delivery: ReviewDelivery | None = None,
|
|
430
|
+
) -> AsyncIterator[CodexEvent]:
|
|
431
|
+
"""Start a code review and stream events.
|
|
432
|
+
|
|
433
|
+
Args:
|
|
434
|
+
target: Review target (uncommittedChanges, baseBranch, commit, or custom)
|
|
435
|
+
delivery: Where to run the review (inline or detached)
|
|
436
|
+
|
|
437
|
+
Yields:
|
|
438
|
+
CodexEvent: Streaming events from the review turn
|
|
439
|
+
"""
|
|
440
|
+
params = ReviewStartParams(thread_id=self.thread_id, target=target, delivery=delivery)
|
|
441
|
+
result = await self._client.dispatch.send_request("review/start", params)
|
|
442
|
+
response = ReviewStartResponse.model_validate(result)
|
|
443
|
+
turn_id = response.turn.id
|
|
444
|
+
review_thread_id = response.review_thread_id
|
|
445
|
+
turn_queue: asyncio.Queue[CodexEvent | None] = asyncio.Queue()
|
|
446
|
+
turn_key = f"{review_thread_id}:{turn_id}"
|
|
447
|
+
self._client._turn_queues[turn_key] = turn_queue
|
|
448
|
+
try:
|
|
449
|
+
while True:
|
|
450
|
+
event = await turn_queue.get()
|
|
451
|
+
match event:
|
|
452
|
+
case None:
|
|
453
|
+
break
|
|
454
|
+
case TurnCompletedEvent():
|
|
455
|
+
yield event
|
|
456
|
+
break
|
|
457
|
+
case ErrorMessage(data=ErrorNotification(error=error)):
|
|
458
|
+
yield event
|
|
459
|
+
raise TurnFailedError(error.message, turn_id=turn_id)
|
|
460
|
+
case _:
|
|
461
|
+
yield event
|
|
462
|
+
finally:
|
|
463
|
+
if turn_key in self._client._turn_queues:
|
|
464
|
+
del self._client._turn_queues[turn_key]
|
|
465
|
+
|
|
425
466
|
# -- Fork ----------------------------------------------------------------
|
|
426
467
|
|
|
427
468
|
async def fork(
|
|
@@ -46,10 +46,7 @@ from codexed.models.events import (
|
|
|
46
46
|
from codexed.models.mcp_server import HttpMcpServer, McpServerConfig, StdioMcpServer
|
|
47
47
|
from codexed.models.misc import (
|
|
48
48
|
ExecPolicyAmendment,
|
|
49
|
-
McpResource,
|
|
50
|
-
McpResourceTemplate,
|
|
51
49
|
McpServerStatusEntry,
|
|
52
|
-
McpTool,
|
|
53
50
|
NetworkApprovalContext,
|
|
54
51
|
NetworkPolicyAmendment,
|
|
55
52
|
SkillRequestApprovalResponse,
|
|
@@ -80,7 +77,6 @@ from codexed.models.responses import (
|
|
|
80
77
|
DynamicToolCallResponse,
|
|
81
78
|
FileChangeRequestApprovalResponse,
|
|
82
79
|
ListMcpServerStatusResponse,
|
|
83
|
-
LoginAccountResponse,
|
|
84
80
|
McpServerElicitationResponse,
|
|
85
81
|
RemoteSkillSummary,
|
|
86
82
|
ReviewStartResponse,
|
|
@@ -152,6 +148,7 @@ from codexed.models.user_input import (
|
|
|
152
148
|
from codexed.models.v2_protocol import (
|
|
153
149
|
ByteRange,
|
|
154
150
|
InitializeCapabilities,
|
|
151
|
+
LoginAccountResponse,
|
|
155
152
|
ThreadResumeParams,
|
|
156
153
|
RawResponseItemCompletedNotification,
|
|
157
154
|
ExternalAgentConfigImportParams,
|
|
@@ -656,8 +653,6 @@ __all__ = [
|
|
|
656
653
|
"McpAuthStatus",
|
|
657
654
|
"McpElicitationFormParams",
|
|
658
655
|
"McpElicitationUrlParams",
|
|
659
|
-
"McpResource",
|
|
660
|
-
"McpResourceTemplate",
|
|
661
656
|
"McpResourceToolsConfig",
|
|
662
657
|
"McpServerConfig",
|
|
663
658
|
"McpServerElicitationRequestParams",
|
|
@@ -670,7 +665,6 @@ __all__ = [
|
|
|
670
665
|
"McpServerStartupStatusUpdatedNotification",
|
|
671
666
|
"McpServerStatusEntry",
|
|
672
667
|
"McpServerStatusUpdatedNotification",
|
|
673
|
-
"McpTool",
|
|
674
668
|
"McpToolCallError",
|
|
675
669
|
"McpToolCallProgressNotification",
|
|
676
670
|
"McpToolCallResult",
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
from __future__ import annotations
|
|
4
4
|
|
|
5
|
-
from typing import
|
|
5
|
+
from typing import Any
|
|
6
6
|
|
|
7
|
-
from mcp.types import
|
|
8
|
-
from pydantic import
|
|
7
|
+
from mcp.types import Resource, ResourceTemplate, Tool
|
|
8
|
+
from pydantic import Field
|
|
9
9
|
|
|
10
10
|
from codexed.models.base import CodexBaseModel
|
|
11
11
|
from codexed.models.codex_types import (
|
|
@@ -24,10 +24,6 @@ from codexed.models.v2_protocol import (
|
|
|
24
24
|
)
|
|
25
25
|
|
|
26
26
|
|
|
27
|
-
if TYPE_CHECKING:
|
|
28
|
-
from mcp.types import Resource, ResourceTemplate, Tool
|
|
29
|
-
|
|
30
|
-
|
|
31
27
|
class NetworkApprovalContext(CodexBaseModel):
|
|
32
28
|
"""Network approval context for command approvals."""
|
|
33
29
|
|
|
@@ -169,89 +165,11 @@ class TurnData(CodexBaseModel):
|
|
|
169
165
|
error: str | None = None
|
|
170
166
|
|
|
171
167
|
|
|
172
|
-
class McpTool(CodexBaseModel):
|
|
173
|
-
"""Tool exposed by an MCP server. Mirrors `mcp.types.Tool`."""
|
|
174
|
-
|
|
175
|
-
name: str
|
|
176
|
-
title: str | None = None
|
|
177
|
-
description: str | None = None
|
|
178
|
-
input_schema: dict[str, Any]
|
|
179
|
-
output_schema: dict[str, Any] | None = None
|
|
180
|
-
annotations: ToolAnnotations | None = None
|
|
181
|
-
icons: list[Icon] | None = None
|
|
182
|
-
field_meta: dict[str, Any] | None = None
|
|
183
|
-
|
|
184
|
-
def to_mcp_tool(self) -> Tool:
|
|
185
|
-
from mcp.types import Tool
|
|
186
|
-
|
|
187
|
-
return Tool(
|
|
188
|
-
name=self.name,
|
|
189
|
-
title=self.title,
|
|
190
|
-
description=self.description,
|
|
191
|
-
inputSchema=self.input_schema,
|
|
192
|
-
outputSchema=self.output_schema,
|
|
193
|
-
annotations=self.annotations,
|
|
194
|
-
icons=self.icons,
|
|
195
|
-
_meta=self.field_meta,
|
|
196
|
-
)
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
class McpResource(CodexBaseModel):
|
|
200
|
-
"""Resource exposed by an MCP server. Mirrors `mcp.types.Resource`."""
|
|
201
|
-
|
|
202
|
-
uri: str
|
|
203
|
-
name: str
|
|
204
|
-
title: str | None = None
|
|
205
|
-
description: str | None = None
|
|
206
|
-
mime_type: str | None = None
|
|
207
|
-
size: int | None = None
|
|
208
|
-
annotations: Annotations | None = None
|
|
209
|
-
icons: list[Icon] | None = None
|
|
210
|
-
field_meta: dict[str, Any] | None = None
|
|
211
|
-
|
|
212
|
-
def to_mcp_resource(self) -> Resource:
|
|
213
|
-
from mcp.types import Resource
|
|
214
|
-
|
|
215
|
-
return Resource(
|
|
216
|
-
uri=AnyUrl(self.uri),
|
|
217
|
-
name=self.name,
|
|
218
|
-
title=self.title,
|
|
219
|
-
description=self.description,
|
|
220
|
-
mimeType=self.mime_type,
|
|
221
|
-
size=self.size,
|
|
222
|
-
annotations=self.annotations,
|
|
223
|
-
icons=self.icons,
|
|
224
|
-
_meta=self.field_meta,
|
|
225
|
-
)
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
class McpResourceTemplate(CodexBaseModel):
|
|
229
|
-
"""Resource template exposed by an MCP server. Mirrors `mcp.types.ResourceTemplate`."""
|
|
230
|
-
|
|
231
|
-
uri_template: str
|
|
232
|
-
name: str
|
|
233
|
-
title: str | None = None
|
|
234
|
-
description: str | None = None
|
|
235
|
-
mime_type: str | None = None
|
|
236
|
-
annotations: Annotations | None = None
|
|
237
|
-
|
|
238
|
-
def to_mcp_resource(self) -> ResourceTemplate:
|
|
239
|
-
from mcp.types import ResourceTemplate
|
|
240
|
-
|
|
241
|
-
return ResourceTemplate(
|
|
242
|
-
uriTemplate=self.uri_template,
|
|
243
|
-
name=self.name,
|
|
244
|
-
title=self.title,
|
|
245
|
-
description=self.description,
|
|
246
|
-
annotations=self.annotations,
|
|
247
|
-
)
|
|
248
|
-
|
|
249
|
-
|
|
250
168
|
class McpServerStatusEntry(CodexBaseModel):
|
|
251
169
|
"""Status of a single MCP server."""
|
|
252
170
|
|
|
253
171
|
name: str
|
|
254
|
-
tools: dict[str,
|
|
255
|
-
resources: list[
|
|
256
|
-
resource_templates: list[
|
|
172
|
+
tools: dict[str, Tool] = Field(default_factory=dict)
|
|
173
|
+
resources: list[Resource] = Field(default_factory=list)
|
|
174
|
+
resource_templates: list[ResourceTemplate] = Field(default_factory=list)
|
|
257
175
|
auth_status: McpAuthStatus = "unsupported"
|
|
@@ -13,7 +13,6 @@ from codexed.models.misc import (
|
|
|
13
13
|
)
|
|
14
14
|
from codexed.models.v2_protocol import (
|
|
15
15
|
AskForApproval,
|
|
16
|
-
AuthMode,
|
|
17
16
|
DynamicToolCallOutputContentItem,
|
|
18
17
|
ReasoningEffort,
|
|
19
18
|
SandboxPolicy,
|
|
@@ -154,16 +153,3 @@ class ListMcpServerStatusResponse(CodexBaseModel):
|
|
|
154
153
|
|
|
155
154
|
data: list[McpServerStatusEntry]
|
|
156
155
|
next_cursor: str | None = None
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
# ============================================================================
|
|
160
|
-
# Account models
|
|
161
|
-
# ============================================================================
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
class LoginAccountResponse(CodexBaseModel):
|
|
165
|
-
"""Response for account/login/start request."""
|
|
166
|
-
|
|
167
|
-
type: AuthMode
|
|
168
|
-
login_id: str | None = None
|
|
169
|
-
auth_url: str | None = None
|
|
@@ -111,9 +111,8 @@ class ThreadItemCommandExecution(BaseThreadItem):
|
|
|
111
111
|
@property
|
|
112
112
|
def item_summary(self) -> str:
|
|
113
113
|
"""Human-readable summary of this command execution."""
|
|
114
|
-
output = self.aggregated_output or ""
|
|
115
114
|
msg = f"[Executed: {self.command}]"
|
|
116
|
-
if output:
|
|
115
|
+
if output := self.aggregated_output:
|
|
117
116
|
msg += f"\n{output[:200]}"
|
|
118
117
|
return msg
|
|
119
118
|
|
|
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
|