Skip to content

Commit 2b06f43

Browse files
KooshaPariclaude
andauthored
fix(workspace): declare 19 missing workspace dependencies (#527)
`cargo metadata` failed because workspace members inherited deps that were not declared in `[workspace.dependencies]`. Internal (path) deps added: - codex-app-server-client (path = "app-server-client") - codex-artifacts (path = "artifacts") - codex-code-mode (path = "code-mode") - codex-connectors (path = "connectors") - codex-exec-server (path = "exec-server") - codex-features (path = "features") - codex-git-utils (path = "git-utils") - codex-package-manager (path = "package-manager") - codex-rollout (path = "rollout") - codex-sandboxing (path = "sandboxing") - codex-terminal-detection (path = "terminal-detection") - codex-tui-app-server (path = "tui_app_server") - codex-utils-output-truncation (path = "utils/output-truncation") - codex-utils-path (path = "utils/path-utils") External (versioned) deps added: - askama = "0.14.0" - fd-lock = "4.0.4" - flate2 = "1.0.35" - quick-xml = "0.38.3" - tar = "0.4.43" - v8 = "130" Also fixed two pre-existing blockers exposed once the deps loaded: - removed orphan workspace member `utils/git` (directory does not exist; no consumer references `codex-git`) - resolved an unmerged conflict marker in `codex-rs/cli/Cargo.toml` by keeping the `codex-sandboxing` workspace dep line Verification: `cargo metadata --manifest-path codex-rs/Cargo.toml --no-deps` now succeeds. Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent e5b1157 commit 2b06f43

2 files changed

Lines changed: 20 additions & 5 deletions

File tree

codex-rs/Cargo.toml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ members = [
4242
"tui",
4343
"utils/absolute-path",
4444
"utils/cargo-bin",
45-
"utils/git",
4645
"utils/cache",
4746
"utils/image",
4847
"utils/json-to-toml",
@@ -82,24 +81,30 @@ app_test_support = { path = "app-server/tests/common" }
8281
codex-ansi-escape = { path = "ansi-escape" }
8382
codex-api = { path = "codex-api" }
8483
codex-app-server = { path = "app-server" }
84+
codex-app-server-client = { path = "app-server-client" }
8585
codex-app-server-protocol = { path = "app-server-protocol" }
8686
codex-app-server-test-client = { path = "app-server-test-client" }
8787
codex-apply-patch = { path = "apply-patch" }
8888
codex-arg0 = { path = "arg0" }
89+
codex-artifacts = { path = "artifacts" }
8990
codex-async-utils = { path = "async-utils" }
9091
codex-backend-client = { path = "backend-client" }
9192
codex-chatgpt = { path = "chatgpt" }
9293
codex-cli = { path = "cli" }
9394
codex-client = { path = "codex-client" }
9495
codex-cloud-requirements = { path = "cloud-requirements" }
96+
codex-code-mode = { path = "code-mode" }
9597
codex-config = { path = "config" }
98+
codex-connectors = { path = "connectors" }
9699
codex-core = { path = "core" }
97100
codex-exec = { path = "exec" }
101+
codex-exec-server = { path = "exec-server" }
98102
codex-execpolicy = { path = "execpolicy" }
99103
codex-experimental-api-macros = { path = "codex-experimental-api-macros" }
104+
codex-features = { path = "features" }
100105
codex-feedback = { path = "feedback" }
101106
codex-file-search = { path = "file-search" }
102-
codex-git = { path = "utils/git" }
107+
codex-git-utils = { path = "git-utils" }
103108
codex-hooks = { path = "hooks" }
104109
codex-keyring-store = { path = "keyring-store" }
105110
codex-linux-sandbox = { path = "linux-sandbox" }
@@ -109,18 +114,23 @@ codex-mcp-server = { path = "mcp-server" }
109114
codex-network-proxy = { path = "network-proxy" }
110115
codex-ollama = { path = "ollama" }
111116
codex-otel = { path = "otel" }
117+
codex-package-manager = { path = "package-manager" }
112118
codex-process-hardening = { path = "process-hardening" }
113119
codex-protocol = { path = "protocol" }
114120
codex-responses-api-proxy = { path = "responses-api-proxy" }
115121
codex-rmcp-client = { path = "rmcp-client" }
122+
codex-rollout = { path = "rollout" }
123+
codex-sandboxing = { path = "sandboxing" }
116124
codex-secrets = { path = "secrets" }
117125
codex-shell-command = { path = "shell-command" }
118126
codex-shell-escalation = { path = "shell-escalation" }
119127
codex-skills = { path = "skills" }
120128
codex-state = { path = "state" }
121129
codex-stdio-to-uds = { path = "stdio-to-uds" }
130+
codex-terminal-detection = { path = "terminal-detection" }
122131
codex-test-macros = { path = "test-macros" }
123132
codex-tui = { path = "tui" }
133+
codex-tui-app-server = { path = "tui_app_server" }
124134
codex-utils-absolute-path = { path = "utils/absolute-path" }
125135
codex-utils-approval-presets = { path = "utils/approval-presets" }
126136
codex-utils-cache = { path = "utils/cache" }
@@ -132,6 +142,8 @@ codex-utils-home-dir = { path = "utils/home-dir" }
132142
codex-utils-image = { path = "utils/image" }
133143
codex-utils-json-to-toml = { path = "utils/json-to-toml" }
134144
codex-utils-oss = { path = "utils/oss" }
145+
codex-utils-output-truncation = { path = "utils/output-truncation" }
146+
codex-utils-path = { path = "utils/path-utils" }
135147
codex-utils-pty = { path = "utils/pty" }
136148
codex-utils-readiness = { path = "utils/readiness" }
137149
codex-utils-rustls-provider = { path = "utils/rustls-provider" }
@@ -154,6 +166,7 @@ assert_matches = "1.5.0"
154166
async-channel = "2.3.1"
155167
async-stream = "0.3.6"
156168
async-trait = "0.1.89"
169+
askama = "0.14.0"
157170
axum = { version = "0.8", default-features = false }
158171
base64 = "0.22.1"
159172
bm25 = "2.3.2"
@@ -176,6 +189,8 @@ encoding_rs = "0.8.35"
176189
env-flags = "0.1.1"
177190
env_logger = "0.11.9"
178191
eventsource-stream = "0.2.3"
192+
fd-lock = "4.0.4"
193+
flate2 = "1.0.35"
179194
futures = { version = "0.3", default-features = false }
180195
gethostname = "1.1.0"
181196
globset = "0.4"
@@ -217,6 +232,7 @@ portable-pty = "0.9.0"
217232
predicates = "3"
218233
pretty_assertions = "1.4.1"
219234
pulldown-cmark = "0.10"
235+
quick-xml = "0.38.3"
220236
rand = "0.9"
221237
ratatui = "0.29.0"
222238
ratatui-macros = "0.6.0"
@@ -262,6 +278,7 @@ strum_macros = "0.27.2"
262278
supports-color = "3.0.2"
263279
syntect = "5"
264280
sys-locale = "0.3.2"
281+
tar = "0.4.43"
265282
tempfile = "3.23.0"
266283
test-log = "0.2.19"
267284
textwrap = "0.16.2"
@@ -293,6 +310,7 @@ unicode-width = "0.2"
293310
url = "2"
294311
urlencoding = "2.1"
295312
uuid = "1"
313+
v8 = "130"
296314
vt100 = "0.16.2"
297315
walkdir = "2.5.0"
298316
webbrowser = "1.0"

codex-rs/cli/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@ codex-mcp-server = { workspace = true }
3636
codex-protocol = { workspace = true }
3737
codex-responses-api-proxy = { workspace = true }
3838
codex-rmcp-client = { workspace = true }
39-
<<<<<<< HEAD
40-
=======
4139
codex-sandboxing = { workspace = true }
42-
>>>>>>> upstream_main
4340
codex-state = { workspace = true }
4441
codex-stdio-to-uds = { workspace = true }
4542
codex-terminal-detection = { workspace = true }

0 commit comments

Comments
 (0)