Skip to content

Commit e7740de

Browse files
committed
Merge origin/main into fix/edit-tool-calls
2 parents 1ee6ac7 + 6b9ed8d commit e7740de

235 files changed

Lines changed: 2487 additions & 1934 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/ci.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,38 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v4
14-
- uses: oven-sh/setup-bun@v2
14+
- uses: actions/setup-node@v6
1515
with:
16-
bun-version: 1.3.11
17-
- run: bun install
16+
node-version: '24'
17+
- run: npm ci
1818
- run: npm run typecheck
1919

2020
test:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- uses: actions/checkout@v4
24-
- uses: oven-sh/setup-bun@v2
24+
- uses: actions/setup-node@v6
2525
with:
26-
bun-version: 1.3.11
27-
- run: bun install
26+
node-version: '24'
27+
- run: npm ci
2828
- run: npm test
29+
- name: Run e2e tests
30+
env:
31+
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
32+
run:
33+
npm run test:e2e
2934

3035
build:
3136
runs-on: ubuntu-latest
3237
steps:
3338
- uses: actions/checkout@v4
39+
- uses: actions/setup-node@v6
40+
with:
41+
node-version: '24'
42+
- run: npm ci
3443
- uses: oven-sh/setup-bun@v2
3544
with:
3645
bun-version: 1.3.11
37-
- run: bun install
3846
- run: npm run bundle:all
3947
- uses: actions/upload-artifact@v4
4048
with:

.github/workflows/codex-update.yml

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@ jobs:
2323
- name: Check if update is required
2424
id: check
2525
run: |
26-
if ! npm outdated ${{ env.CODEX_PACKAGE }}; then
26+
if ! npm outdated "$CODEX_PACKAGE"; then
2727
echo "Package is up to date"
2828
exit 0
2929
fi
3030
31-
LATEST=$(npm view ${{ env.CODEX_PACKAGE }} version)
31+
LATEST=$(npm view "$CODEX_PACKAGE" version)
3232
BRANCH="codex-update/$LATEST"
3333
3434
if git ls-remote --exit-code --heads origin "refs/heads/$BRANCH" >/dev/null 2>&1; then
3535
echo "Branch $BRANCH already exists"
3636
exit 0
3737
fi
3838
39-
echo "version=$LATEST" >> $GITHUB_OUTPUT
40-
echo "branch=$BRANCH" >> $GITHUB_OUTPUT
41-
echo "should_update=true" >> $GITHUB_OUTPUT
39+
echo "version=$LATEST" >> "$GITHUB_OUTPUT"
40+
echo "branch=$BRANCH" >> "$GITHUB_OUTPUT"
41+
echo "should_update=true" >> "$GITHUB_OUTPUT"
4242
4343
update:
4444
needs: check
@@ -48,20 +48,29 @@ jobs:
4848
BRANCH: ${{ needs.check.outputs.branch }}
4949
VERSION: ${{ needs.check.outputs.version }}
5050
steps:
51+
- name: Generate GitHub token
52+
uses: actions/create-github-app-token@v2
53+
id: generate-token
54+
with:
55+
app-id: ${{ secrets.RELEASE_PLZ_APP_ID }}
56+
private-key: ${{ secrets.RELEASE_PLZ_APP_PRIVATE_KEY }}
57+
5158
- uses: actions/checkout@v4
59+
with:
60+
token: ${{ steps.generate-token.outputs.token }}
5261

5362
- name: Configure git user and prepare branch
5463
run: |
5564
git config user.name "github-actions[bot]"
5665
git config user.email "github-actions[bot]@users.noreply.github.com"
57-
git checkout -b "${{ env.BRANCH }}"
66+
git checkout -b "$BRANCH" --
5867
5968
- name: Install new version of package and commit
6069
run: |
61-
npm install ${{ env.CODEX_PACKAGE }}@${{ env.VERSION }}
70+
npm install "$CODEX_PACKAGE@$VERSION"
6271
npm run generate-types
6372
git add package.json package-lock.json src/app-server
64-
git commit -m "Update codex to ${{ env.VERSION }}"
73+
git commit -m "Update codex to $VERSION"
6574
6675
- name: Finalize update with Codex
6776
id: codex-finalize
@@ -83,23 +92,16 @@ jobs:
8392
8493
- name: Push branch updates
8594
run: |
86-
git push origin "${{ env.BRANCH }}"
87-
88-
- name: Generate GitHub App token
89-
id: app-token
90-
uses: actions/create-github-app-token@v1
91-
with:
92-
app-id: ${{ vars.GH_APP_ID }}
93-
private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
95+
git push -- origin "$BRANCH"
9496
9597
- name: Create PR
9698
env:
97-
GH_TOKEN: ${{ steps.app-token.outputs.token }}
99+
GH_TOKEN: ${{ steps.generate-token.outputs.token }}
98100
run: |
99-
echo -e "[What's new](https://github.com/openai/codex/releases/tag/rust-v${{ env.VERSION }})\n\n$(cat pr-body.md 2>/dev/null || true)" > pr-body.md
101+
echo -e "[What's new](https://github.com/openai/codex/releases/tag/rust-v${VERSION})\n\n$(cat pr-body.md 2>/dev/null || true)" > pr-body.md
100102
101103
gh pr create \
102104
--base main \
103-
--title "Update codex to ${{ env.VERSION }}" \
105+
--title "Update codex to $VERSION" \
104106
--body-file pr-body.md \
105107
--label "codex-update"

.github/workflows/publish-npm.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 0 additions & 227 deletions
This file was deleted.
File renamed without changes.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# codex-acp
1+
# ACP adapter for Codex CLI
2+
[![npm version](https://img.shields.io/npm/v/%40jetbrains%2Fcodex-acp)](https://www.npmjs.com/package/@jetbrains/codex-acp)
23

3-
ACP server implementation that exposes Codex CLI functionality for smoother client and IDE integration.
44

55
## Documentation
66

0 commit comments

Comments
 (0)