client: clear disconnected hub token on standalone recycle - #407
Conversation
release: promote dev into main for v2.32.1
# Conflicts: # package.json
[WRONG BRANCH] merge dev into main for the v2.33.0 release
Promotes the dev integration line onto main. The resulting tree is byte-identical to origin/dev, including package.json at 2.34.0. The package.json conflict is resolved to dev's side, NOT to main's stale 2.33.0. Earlier promotions (lidge-jun#2553, lidge-jun#2507) kept the target's version so the release bump would land on its own "release: vX.Y.Z" commit. That is no longer legal: this very delta adds tests/release-version-line.test.ts, which fails when the in-tree version sits behind the highest release tag. With v2.34.0-preview.20260827 now published, 2.33.0 orders behind it, so a promotion carrying the stale line turns CI red on every shard that runs the suite. The consequence for the release step is that scripts/release.ts skips the bump (release.ts:568, currentVersion === version), so v2.34.0 gets tagged on this merge commit rather than on a separate release commit. The workflow creates the tag itself after publishing and validates expected-sha against the checked-out commit, so the tag still names exactly the audited tree.
[WRONG BRANCH] promote dev onto main for v2.34.0
[WRONG BRANCH] promote dev onto main for v2.35.0
[WRONG BRANCH] promote dev onto main for v2.36.0
[WRONG BRANCH] promote dev to main for the v2.37.0 release
[WRONG BRANCH] promote dev onto main for v2.38.0
[WRONG BRANCH] promote dev onto main for v2.39.0
release: promote dev to main for v2.40.0
…rkflow call (lidge-jun#3262) Both v2.40.0 release dispatches (33615174183 preview, 33615177849 main) died at startup_failure: a workflow_call cannot grant its callee more than the calling job holds, and dev-version-bump.yml's job declares contents+pull- requests write. lidge-jun#3129 wired the call but never dispatched a release, so this is its first live run. The caller job now declares exactly the callee's two permissions; no other job in release.yml gains anything. Co-authored-by: jun <jun@lidge.dev> (cherry picked from commit 7ce0ba5)
…400-relfix release: carry the release.yml permissions fix onto main for v2.40.0
|
Important
This repository does not receive automatic reviews because it has fewer than 10 stars. ⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: ASSERTIVE Plan: Team Run ID: Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
|
✅ Deterministic PR hygiene checks passed. |
✅ READY
Hygiene✅ Deterministic PR hygiene checks passed. |
github-actions
Bot
changed the title
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 1ea3f4795d
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| stdio: "ignore", | ||
| windowsHide: true, | ||
| env: { ...process.env }, | ||
| env: standaloneRecycleEnv(process.env, disconnectedTokenFingerprint), |
There was a problem hiding this comment.
When the client runs under the Windows Task Scheduler service, this filtered environment is never used because OCX_SERVICE=1 exits through the supervised branch first. In buildWindowsServiceScript (src/service.ts:1727-1758), OPENCODEX_API_AUTH_TOKEN is loaded once before :loop; after disconnect removes the token file and exits with code 1, the wrapper loops without clearing that variable and starts the standalone proxy with the disconnected hub token still active. Reload or clear the token within the wrapper loop, or otherwise communicate the sanitized environment to supervised restarts.
AGENTS.md reference: AGENTS.md:L329-L335
Useful? React with 👍 / 👎.
| const admissionToken = childEnv.OPENCODEX_API_AUTH_TOKEN?.trim(); | ||
| if (admissionToken && serviceApiTokenFingerprint(admissionToken) === disconnectedTokenFingerprint) { | ||
| delete childEnv.OPENCODEX_API_AUTH_TOKEN; | ||
| delete childEnv.OCX_API_TOKEN_FILE; |
There was a problem hiding this comment.
If OPENCODEX_API_AUTH_TOKEN contains the disconnected hub token while OCX_API_TOKEN_FILE points to an independently configured operator credential, this deletes both variables solely because the environment token matches. The replacement therefore cannot let loadServiceTokenFromFile restore the operator credential and starts with no intended admission token. Check the referenced file's token fingerprint or only remove OCX_API_TOKEN_FILE when it identifies the disconnected service-token source.
AGENTS.md reference: src/AGENTS.md:L10-L10
Useful? React with 👍 / 👎.
luvs01
changed the title
2 participants
Motivation
Description
scheduleStandaloneRecycleto accept adisconnectedTokenFingerprintand supplyingstate.tokenFingerprintat disconnect (src/client/machine-api.ts,src/client/machine-listener.ts).standaloneRecycleEnv(env, disconnectedTokenFingerprint)to clone and filterprocess.env, removingOPENCODEX_API_AUTH_TOKENandOCX_API_TOKEN_FILEonly when the admission token's fingerprint equals the disconnected fingerprint, and use that filtered env when spawning the detached child (src/client/runtime.ts).tests/client-runtime.test.ts) and adapt an existing listener test to assert fingerprint propagation (tests/client-machine-listener.test.ts).Testing
node_modulesusingnode_modules/.bin/bun test tests/client-runtime.test.ts tests/client-machine-listener.test.ts, and all tests passed (8 passed, 0 failed).node_modules/.bin/bun run typecheckandnode_modules/.bin/bun run privacy:scanboth succeeded.node:zlibexport error; re-running with the repo-provided Bun binary resolved that and the focused tests passed as above.Codex Task