Skip to content

Commit 29cf11f

Browse files
lee101claude
lee101
and
claude
committed
Codex Infinity v1.3.35 - merge upstream + maintain custom features
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2 parents 93fa1ec + 43a69c5 commit 29cf11f

196 files changed

Lines changed: 10801 additions & 2531 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/rust-release-prepare.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
)
4141
4242
url="${base_url%/}/models?client_version=${client_version}"
43-
curl --http1.1 --fail --show-error --location "${headers[@]}" "${url}" | jq '.' > codex-rs/core/models.json
43+
curl --http1.1 --fail --show-error --location "${headers[@]}" "${url}" | jq '.' > codex-rs/models-manager/models.json
4444
4545
- name: Open pull request (if changed)
4646
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8

‎codex-cli/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@codex-infinity/codex-infinity",
3-
"version": "1.3.34",
3+
"version": "1.3.35",
44
"license": "Apache-2.0",
55
"description": "Codex Infinity - a smarter coding agent that can run forever",
66
"bin": {

‎codex-rs/Cargo.lock‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎codex-rs/Cargo.toml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ env_logger = "0.11.9"
242242
eventsource-stream = "0.2.3"
243243
futures = { version = "0.3", default-features = false }
244244
gethostname = "1.1.0"
245+
glob = "0.3"
245246
globset = "0.4"
246247
hmac = "0.12.1"
247248
http = "1.3.1"
@@ -424,6 +425,12 @@ ignored = [
424425
"codex-v8-poc",
425426
]
426427

428+
[profile.dev-small]
429+
inherits = "dev"
430+
opt-level = 0
431+
debug = 0
432+
strip = true
433+
427434
[profile.release]
428435
lto = "fat"
429436
split-debuginfo = "off"

‎codex-rs/analytics/src/client.rs‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ impl AnalyticsEventsClient {
297297
}
298298

299299
async fn send_track_events(
300-
auth_manager: &AuthManager,
300+
auth_manager: &Arc<AuthManager>,
301301
base_url: &str,
302302
events: Vec<TrackEventRequest>,
303303
) {
@@ -310,9 +310,11 @@ async fn send_track_events(
310310
if !auth.is_chatgpt_auth() {
311311
return;
312312
}
313-
let access_token = match auth.get_token() {
314-
Ok(token) => token,
315-
Err(_) => return,
313+
let Some(authorization_header_value) = auth_manager
314+
.chatgpt_authorization_header_for_auth(&auth)
315+
.await
316+
else {
317+
return;
316318
};
317319
let Some(account_id) = auth.get_account_id() else {
318320
return;
@@ -322,15 +324,17 @@ async fn send_track_events(
322324
let url = format!("{base_url}/codex/analytics-events/events");
323325
let payload = TrackEventsRequest { events };
324326

325-
let response = create_client()
327+
let mut request = create_client()
326328
.post(&url)
327329
.timeout(ANALYTICS_EVENTS_TIMEOUT)
328-
.bearer_auth(&access_token)
330+
.header("authorization", authorization_header_value)
329331
.header("chatgpt-account-id", &account_id)
330332
.header("Content-Type", "application/json")
331-
.json(&payload)
332-
.send()
333-
.await;
333+
.json(&payload);
334+
if auth.is_fedramp_account() {
335+
request = request.header("X-OpenAI-Fedramp", "true");
336+
}
337+
let response = request.send().await;
334338

335339
match response {
336340
Ok(response) if response.status().is_success() => {}

‎codex-rs/app-server-client/src/lib.rs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,29 +64,17 @@ pub use crate::remote::RemoteAppServerConnectArgs;
6464
/// module exists so clients can remove a direct `codex-core` dependency
6565
/// while legacy startup/config paths are migrated to RPCs.
6666
pub mod legacy_core {
67-
pub use codex_core::Cursor;
6867
pub use codex_core::DEFAULT_AGENTS_MD_FILENAME;
69-
pub use codex_core::INTERACTIVE_SESSION_SOURCES;
7068
pub use codex_core::LOCAL_AGENTS_MD_FILENAME;
7169
pub use codex_core::McpManager;
72-
pub use codex_core::PLUGIN_TEXT_MENTION_SIGIL;
73-
pub use codex_core::RolloutRecorder;
74-
pub use codex_core::TOOL_MENTION_SIGIL;
75-
pub use codex_core::ThreadItem;
76-
pub use codex_core::ThreadSortKey;
77-
pub use codex_core::ThreadsPage;
7870
pub use codex_core::append_message_history_entry;
7971
pub use codex_core::append_message_history_entry_with_cwd;
8072
pub use codex_core::check_execpolicy_for_warnings;
81-
pub use codex_core::find_thread_meta_by_name_str;
82-
pub use codex_core::find_thread_name_by_id;
83-
pub use codex_core::find_thread_names_by_ids;
8473
pub use codex_core::format_exec_policy_error_with_source;
8574
pub use codex_core::grant_read_root_non_elevated;
8675
pub use codex_core::lookup_message_history_entry;
8776
pub use codex_core::message_history_metadata;
8877
pub use codex_core::path_utils;
89-
pub use codex_core::read_session_meta_line;
9078
pub use codex_core::web_search_detail;
9179

9280
pub mod config {
@@ -125,10 +113,6 @@ pub mod legacy_core {
125113
pub use codex_core::review_prompts::*;
126114
}
127115

128-
pub mod skills {
129-
pub use codex_core::skills::*;
130-
}
131-
132116
pub mod test_support {
133117
pub use codex_core::test_support::*;
134118
}

‎codex-rs/app-server-protocol/schema/json/ClientRequest.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,6 +1287,17 @@
12871287
],
12881288
"type": "object"
12891289
},
1290+
"MarketplaceRemoveParams": {
1291+
"properties": {
1292+
"marketplaceName": {
1293+
"type": "string"
1294+
}
1295+
},
1296+
"required": [
1297+
"marketplaceName"
1298+
],
1299+
"type": "object"
1300+
},
12901301
"McpResourceReadParams": {
12911302
"properties": {
12921303
"server": {
@@ -4245,6 +4256,30 @@
42454256
"title": "Marketplace/addRequest",
42464257
"type": "object"
42474258
},
4259+
{
4260+
"properties": {
4261+
"id": {
4262+
"$ref": "#/definitions/RequestId"
4263+
},
4264+
"method": {
4265+
"enum": [
4266+
"marketplace/remove"
4267+
],
4268+
"title": "Marketplace/removeRequestMethod",
4269+
"type": "string"
4270+
},
4271+
"params": {
4272+
"$ref": "#/definitions/MarketplaceRemoveParams"
4273+
}
4274+
},
4275+
"required": [
4276+
"id",
4277+
"method",
4278+
"params"
4279+
],
4280+
"title": "Marketplace/removeRequest",
4281+
"type": "object"
4282+
},
42484283
{
42494284
"properties": {
42504285
"id": {

‎codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,30 @@
675675
"title": "Marketplace/addRequest",
676676
"type": "object"
677677
},
678+
{
679+
"properties": {
680+
"id": {
681+
"$ref": "#/definitions/v2/RequestId"
682+
},
683+
"method": {
684+
"enum": [
685+
"marketplace/remove"
686+
],
687+
"title": "Marketplace/removeRequestMethod",
688+
"type": "string"
689+
},
690+
"params": {
691+
"$ref": "#/definitions/v2/MarketplaceRemoveParams"
692+
}
693+
},
694+
"required": [
695+
"id",
696+
"method",
697+
"params"
698+
],
699+
"title": "Marketplace/removeRequest",
700+
"type": "object"
701+
},
678702
{
679703
"properties": {
680704
"id": {
@@ -9333,6 +9357,42 @@
93339357
],
93349358
"type": "object"
93359359
},
9360+
"MarketplaceRemoveParams": {
9361+
"$schema": "http://json-schema.org/draft-07/schema#",
9362+
"properties": {
9363+
"marketplaceName": {
9364+
"type": "string"
9365+
}
9366+
},
9367+
"required": [
9368+
"marketplaceName"
9369+
],
9370+
"title": "MarketplaceRemoveParams",
9371+
"type": "object"
9372+
},
9373+
"MarketplaceRemoveResponse": {
9374+
"$schema": "http://json-schema.org/draft-07/schema#",
9375+
"properties": {
9376+
"installedRoot": {
9377+
"anyOf": [
9378+
{
9379+
"$ref": "#/definitions/v2/AbsolutePathBuf"
9380+
},
9381+
{
9382+
"type": "null"
9383+
}
9384+
]
9385+
},
9386+
"marketplaceName": {
9387+
"type": "string"
9388+
}
9389+
},
9390+
"required": [
9391+
"marketplaceName"
9392+
],
9393+
"title": "MarketplaceRemoveResponse",
9394+
"type": "object"
9395+
},
93369396
"McpAuthStatus": {
93379397
"enum": [
93389398
"unsupported",

‎codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,6 +1271,30 @@
12711271
"title": "Marketplace/addRequest",
12721272
"type": "object"
12731273
},
1274+
{
1275+
"properties": {
1276+
"id": {
1277+
"$ref": "#/definitions/RequestId"
1278+
},
1279+
"method": {
1280+
"enum": [
1281+
"marketplace/remove"
1282+
],
1283+
"title": "Marketplace/removeRequestMethod",
1284+
"type": "string"
1285+
},
1286+
"params": {
1287+
"$ref": "#/definitions/MarketplaceRemoveParams"
1288+
}
1289+
},
1290+
"required": [
1291+
"id",
1292+
"method",
1293+
"params"
1294+
],
1295+
"title": "Marketplace/removeRequest",
1296+
"type": "object"
1297+
},
12741298
{
12751299
"properties": {
12761300
"id": {
@@ -6065,6 +6089,42 @@
60656089
],
60666090
"type": "object"
60676091
},
6092+
"MarketplaceRemoveParams": {
6093+
"$schema": "http://json-schema.org/draft-07/schema#",
6094+
"properties": {
6095+
"marketplaceName": {
6096+
"type": "string"
6097+
}
6098+
},
6099+
"required": [
6100+
"marketplaceName"
6101+
],
6102+
"title": "MarketplaceRemoveParams",
6103+
"type": "object"
6104+
},
6105+
"MarketplaceRemoveResponse": {
6106+
"$schema": "http://json-schema.org/draft-07/schema#",
6107+
"properties": {
6108+
"installedRoot": {
6109+
"anyOf": [
6110+
{
6111+
"$ref": "#/definitions/AbsolutePathBuf"
6112+
},
6113+
{
6114+
"type": "null"
6115+
}
6116+
]
6117+
},
6118+
"marketplaceName": {
6119+
"type": "string"
6120+
}
6121+
},
6122+
"required": [
6123+
"marketplaceName"
6124+
],
6125+
"title": "MarketplaceRemoveResponse",
6126+
"type": "object"
6127+
},
60686128
"McpAuthStatus": {
60696129
"enum": [
60706130
"unsupported",

‎codex-rs/app-server-protocol/schema/json/v2/MarketplaceRemoveParams.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"$schema": "http://json-schema.org/draft-07/schema#",
3+
"properties": {
4+
"marketplaceName": {
5+
"type": "string"
6+
}
7+
},
8+
"required": [
9+
"marketplaceName"
10+
],
11+
"title": "MarketplaceRemoveParams",
12+
"type": "object"
13+
}

0 commit comments

Comments
 (0)