Skip to content

Commit ada3331

Browse files
author
Lee Penkman
committed
Codex Infinity v1.3.43 - merge upstream + maintain custom features
2 parents eecca4f + 64bdeed commit ada3331

1,990 files changed

Lines changed: 326497 additions & 118744 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.

.codex/skills/path-types/SKILL.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,6 @@ migration; if compliance is difficult, ask the user how to proceed.
1919
- Tool call arguments that the model is expected to generate should be deserialized as regular
2020
`String`s with feature-specific path handling code.
2121

22-
## Rollout stability
23-
24-
Assume that rollouts will be parsed by monotonically increasing versions of Codex.
25-
26-
You can use `PathUri` in place of `AbsolutePathBuf` for rollout fields without jeopardizing
27-
backwards compatibility since `PathUri` allows deserialization from bare absolute paths.
28-
2922
## Migration requirements
3023

3124
Keep these requirements in mind while migrating code to conform with the above guidelines:
@@ -38,6 +31,10 @@ Keep these requirements in mind while migrating code to conform with the above g
3831
* path reasoning must work before the related environment has come online
3932
* URIs cannot explicitly encode the executor’s path convention or operating system
4033
* users must not configure the environment’s OS/path convention explicitly
34+
* URIs should not yet be stored in rollouts, databases, or other persistent storage
35+
* path conversion errors: fail-closed for security-relevant paths, fail-open for UI/diagnostics
36+
* prefer small focused methods on `PathUri` or `LegacyAppPathString` over local helpers
37+
* represent `PathUri` values as URIs in diagnostics
4138

4239
It is OK if the conversion between paths and URIs is somewhat lossy as long as it will do the right
4340
thing for real users.

.github/workflows/rust-ci.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,8 @@ jobs:
163163
runner: macos-15-xlarge
164164
timeout_minutes: 30
165165
- name: Windows
166-
runner: windows-x64
166+
runner: windows-2022
167167
timeout_minutes: 30
168-
runs_on:
169-
group: ${{ github.event.repository.name }}-runners
170-
labels: ${{ github.event.repository.name }}-windows-x64
171168
steps:
172169
- name: Check whether argument comment lint should run
173170
id: argument_comment_lint_gate

.github/workflows/rust-release-windows.yml

Lines changed: 19 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ jobs:
1313
build-windows-binaries:
1414
name: Build Windows binaries - ${{ matrix.runner }} - ${{ matrix.target }} - ${{ matrix.bundle }}
1515
runs-on: ${{ matrix.runs_on }}
16-
timeout-minutes: 60
16+
# Windows release builds can exceed an hour, so keep the timeout aligned
17+
# with the top-level release build headroom.
18+
timeout-minutes: 90
1719
permissions:
1820
contents: read
1921
defaults:
@@ -67,7 +69,9 @@ jobs:
6769
labels: ${{ github.event.repository.name }}-windows-arm64
6870

6971
steps:
70-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
72+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
73+
with:
74+
persist-credentials: false
7175
- name: Print runner specs (Windows)
7276
shell: powershell
7377
run: |
@@ -105,7 +109,7 @@ jobs:
105109
cargo build --target "$target" --release --timings "${build_args[@]}"
106110
107111
- name: Upload Cargo timings
108-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
112+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
109113
with:
110114
name: cargo-timings-rust-release-windows-${{ matrix.target }}-${{ matrix.bundle }}
111115
path: codex-rs/target/**/cargo-timings/cargo-timing.html
@@ -133,7 +137,7 @@ jobs:
133137
done
134138
135139
- name: Upload Windows binaries
136-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
140+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
137141
with:
138142
name: windows-binaries-${{ matrix.target }}-${{ matrix.bundle }}
139143
path: |
@@ -187,7 +191,10 @@ jobs:
187191
- build-windows-binaries
188192
name: Build - ${{ matrix.runner }} - ${{ matrix.target }}
189193
runs-on: ${{ matrix.runs_on }}
190-
timeout-minutes: 60
194+
environment:
195+
name: azure-artifact-signing
196+
deployment: false
197+
timeout-minutes: 90
191198
permissions:
192199
contents: read
193200
id-token: write
@@ -210,22 +217,24 @@ jobs:
210217
labels: ${{ github.event.repository.name }}-windows-x64
211218

212219
steps:
213-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
220+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
221+
with:
222+
persist-credentials: false
214223

215224
- name: Download prebuilt Windows primary binaries
216-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
225+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
217226
with:
218227
name: windows-binaries-${{ matrix.target }}-primary
219228
path: codex-rs/target/${{ matrix.target }}/release
220229

221230
- name: Download prebuilt Windows helper binaries
222-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
231+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
223232
with:
224233
name: windows-binaries-${{ matrix.target }}-helpers
225234
path: codex-rs/target/${{ matrix.target }}/release
226235

227236
- name: Download prebuilt Windows app-server binary
228-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
237+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
229238
with:
230239
name: windows-binaries-${{ matrix.target }}-app-server
231240
path: codex-rs/target/${{ matrix.target }}/release
@@ -264,63 +273,6 @@ jobs:
264273
- name: Install DotSlash
265274
uses: facebook/install-dotslash@1e4e7b3e07eaca387acb98f1d4720e0bee8dbb6a # v2
266275

267-
<<<<<<< HEAD
268-
||||||| 60b45d92d9
269-
- name: Build Codex package archives
270-
shell: bash
271-
run: |
272-
set -euo pipefail
273-
for bundle in primary app-server; do
274-
bash "${GITHUB_WORKSPACE}/.github/scripts/build-codex-package-archive.sh" \
275-
--target "${{ matrix.target }}" \
276-
--bundle "$bundle" \
277-
--entrypoint-dir "target/${{ matrix.target }}/release" \
278-
--archive-dir "dist/${{ matrix.target }}"
279-
done
280-
281-
- name: Build Python runtime wheel
282-
shell: bash
283-
run: |
284-
set -euo pipefail
285-
286-
case "${{ matrix.target }}" in
287-
aarch64-pc-windows-msvc)
288-
platform_tag="win_arm64"
289-
;;
290-
x86_64-pc-windows-msvc)
291-
platform_tag="win_amd64"
292-
;;
293-
*)
294-
echo "No Python runtime wheel platform tag for ${{ matrix.target }}"
295-
exit 1
296-
;;
297-
esac
298-
299-
python -m venv "${RUNNER_TEMP}/python-runtime-build-venv"
300-
"${RUNNER_TEMP}/python-runtime-build-venv/Scripts/python.exe" -m pip install build
301-
302-
stage_dir="${RUNNER_TEMP}/openai-codex-cli-bin-${{ matrix.target }}"
303-
wheel_dir="${GITHUB_WORKSPACE}/python-runtime-dist/${{ matrix.target }}"
304-
# Keep the helpers next to codex.exe in the runtime wheel so Windows
305-
# sandbox/elevation lookup matches the standalone release zip.
306-
python "${GITHUB_WORKSPACE}/sdk/python/scripts/update_sdk_artifacts.py" \
307-
stage-runtime \
308-
"$stage_dir" \
309-
"${GITHUB_WORKSPACE}/codex-rs/target/${{ matrix.target }}/release/codex.exe" \
310-
--codex-version "${GITHUB_REF_NAME}" \
311-
--platform-tag "$platform_tag" \
312-
--resource-binary "${GITHUB_WORKSPACE}/codex-rs/target/${{ matrix.target }}/release/codex-command-runner.exe" \
313-
--resource-binary "${GITHUB_WORKSPACE}/codex-rs/target/${{ matrix.target }}/release/codex-windows-sandbox-setup.exe"
314-
"${RUNNER_TEMP}/python-runtime-build-venv/Scripts/python.exe" -m build --wheel --outdir "$wheel_dir" "$stage_dir"
315-
316-
- name: Upload Python runtime wheel
317-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
318-
with:
319-
name: python-runtime-wheel-${{ matrix.target }}
320-
path: python-runtime-dist/${{ matrix.target }}/*.whl
321-
if-no-files-found: error
322-
323-
=======
324276
- name: Build Codex package archives
325277
shell: bash
326278
run: |
@@ -382,7 +334,6 @@ jobs:
382334
path: python-runtime-dist/${{ matrix.target }}/*.whl
383335
if-no-files-found: error
384336

385-
>>>>>>> upstream/main
386337
- name: Compress artifacts
387338
shell: bash
388339
run: |
@@ -452,7 +403,7 @@ jobs:
452403
"${GITHUB_WORKSPACE}/.github/workflows/zstd" -T0 -19 "$dest/$base"
453404
' _
454405
455-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
406+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
456407
with:
457408
name: ${{ matrix.target }}
458409
path: |

0 commit comments

Comments
 (0)