Reuse guardian session across approvals by charley-oai · Pull Request #14668 · openai/codex

charley-oai · 2026-03-14T04:26:51Z

Summary

reuse a guardian subagent session across approvals so reviews keep a stable prompt cache key and avoid one-shot startup overhead
clear the guardian child history before each review so prior guardian decisions do not leak into later approvals
include the smart_approvals -> guardian_approval feature flag rename in the same PR to minimize release latency on a very tight timeline
add regression coverage for prompt-cache-key reuse without prior-review prompt bleed

Request

Bug/enhancement request: internal guardian prompt-cache and latency improvement request

Keep a persistent guardian subagent per parent session so approval reviews can reuse the same prompt cache key. Reset the child history before each review so prior guardian decisions do not leak into later reviews, while keeping the existing timeout and cancellation behavior intact. Co-authored-by: Codex <noreply@openai.com>

charley-oai · 2026-03-14T06:07:03Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2618df074e

ℹ️ 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".

codex-rs/core/src/guardian_subagent.rs

Start the guardian review deadline before the reusable-subagent manager lock and carry it through subagent spawn, history reset, network approval copying, and turn submission. Keep timeout-triggered cleanup non-blocking and heap-box the heavy timeout-wrapped futures so the prompt-cache reuse test does not overflow its stack. Co-authored-by: Codex <noreply@openai.com>

Add an explicit guardian-subagent manager shutdown hook and call it from the parent session shutdown path, with a fallback on submission-loop exit if the channel closes without an explicit shutdown op. Add a regression test that caches a guardian child and asserts parent shutdown sends the child its own Op::Shutdown. Co-authored-by: Codex <noreply@openai.com>

charley-oai · 2026-03-14T21:27:45Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 75d8487381

ℹ️ 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".

codex-rs/core/src/guardian/review_session.rs

codex-rs/core/src/guardian_subagent.rs

Rename the experimental guardian approvals flag back to guardian_approval, migrate the deprecated smart_approvals alias, and update the CLI/TUI copy. Also propagate guardian review cancellation into reusable subagent spawn and replace cached session-approved hosts when syncing from the parent review session. Co-authored-by: Codex <noreply@openai.com>

charley-oai · 2026-03-14T23:39:26Z

@codex review this

charley-oai · 2026-03-14T23:42:39Z

codex-rs/core/src/tools/network_approval.rs

-        let approved_hosts = self.session_approved_hosts.lock().await;
+        let approved_hosts = self.session_approved_hosts.lock().await.clone();
        let mut other_approved_hosts = other.session_approved_hosts.lock().await;
+        other_approved_hosts.clear();


Before:

copy_session_approved_hosts_to() only did extend(...)

if the cached guardian child had old approved hosts, they stayed there forever

After:

it clones the parent’s current approved-host set

clears the child’s set

repopulates it from the parent snapshot

That matters because the guardian session is now reused. Without this, the child could keep stale network approvals from earlier reviews and end
up with broader access than the parent session.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: cc72ff4ccf

ℹ️ 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".

codex-rs/core/src/config/mod.rs

Split guardian logic into focused modules, rename the reusable child session plumbing to review-session terminology, and move the guardian snapshot alongside the moved tests. Also preserve explicit false values when migrating smart_approvals to guardian_approval. Co-authored-by: Codex <noreply@openai.com>

charley-oai · 2026-03-15T01:13:34Z

@codex review this

Add snapshot coverage for reused guardian review sessions so follow-up requests show a stable prompt-cache key without retaining prior guardian output. Co-authored-by: Codex <noreply@openai.com>

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9859060066

ℹ️ 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".

codex-rs/core/src/guardian/review_session.rs

codex-rs/core/src/config/mod.rs

Reuse the cached guardian child only when the full effective review-session config matches the next review, so provider and backend changes force a respawn. Co-authored-by: Codex <noreply@openai.com>

charley-oai · 2026-03-15T01:47:56Z

@codex review this

chatgpt-codex-connector · 2026-03-15T01:55:27Z

Codex Review: Didn't find any major issues. Already looking forward to the next diff.

ℹ️ 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".

Keep follow-up guardian approvals on the same child conversation instead of clearing history between reviews, and update the snapshot to show the appended prior review context. Co-authored-by: Codex <noreply@openai.com>

charley-oai · 2026-03-15T23:09:54Z

@codex review this

Co-authored-by: Codex <noreply@openai.com>

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 418b3a9cd4

ℹ️ 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".

codex-rs/core/src/guardian/review_session.rs

codex-rs/core/src/config/mod.rs

Co-authored-by: Codex <noreply@openai.com>

charley-oai · 2026-03-16T00:20:13Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2b95cea921

ℹ️ 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".

codex-rs/core/src/guardian/review_session.rs

codex-rs/core/src/config/mod.rs

Co-authored-by: Codex <noreply@openai.com>

charley-oai · 2026-03-16T03:00:46Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c0a6417815

ℹ️ 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".

codex-rs/core/src/guardian/review_session.rs

codex-rs/core/src/config/mod.rs

Co-authored-by: Codex <noreply@openai.com>

charley-oai · 2026-03-16T05:04:03Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9822da0541

ℹ️ 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".

codex-rs/core/src/guardian/review_session.rs

codex-rs/core/src/config/mod.rs

Co-authored-by: Codex <noreply@openai.com>

charley-oai · 2026-03-16T05:50:41Z

@codex review this

charley-oai force-pushed the ccunningham/reuse-guardian-session branch from 6a07464 to 2618df0 Compare March 14, 2026 06:05

chatgpt-codex-connector bot reviewed Mar 14, 2026

View reviewed changes

codex-rs/core/src/guardian_subagent.rs Outdated Show resolved Hide resolved

codex-rs/core/src/guardian_subagent.rs Outdated Show resolved Hide resolved

charley-oai and others added 2 commits March 14, 2026 13:56

chatgpt-codex-connector bot reviewed Mar 14, 2026

View reviewed changes

codex-rs/core/src/guardian/review_session.rs Outdated Show resolved Hide resolved

codex-rs/core/src/guardian_subagent.rs Outdated Show resolved Hide resolved

charley-oai commented Mar 14, 2026

View reviewed changes

chatgpt-codex-connector bot reviewed Mar 14, 2026

View reviewed changes

codex-rs/core/src/config/mod.rs Outdated Show resolved Hide resolved

github-actions bot mentioned this pull request Mar 15, 2026

📊 AI CLI 工具社区动态日报 2026-03-15 gsscsd/big_model_radar#37

Open

charley-oai marked this pull request as ready for review March 15, 2026 01:13

Add guardian follow-up prompt snapshot

127e87d

Add snapshot coverage for reused guardian review sessions so follow-up requests show a stable prompt-cache key without retaining prior guardian output. Co-authored-by: Codex <noreply@openai.com>

chatgpt-codex-connector bot reviewed Mar 15, 2026

View reviewed changes

codex-rs/core/src/guardian/review_session.rs Outdated Show resolved Hide resolved

codex-rs/core/src/config/mod.rs Show resolved Hide resolved

Invalidate cached guardian session on config changes

80c267e

Reuse the cached guardian child only when the full effective review-session config matches the next review, so provider and backend changes force a respawn. Co-authored-by: Codex <noreply@openai.com>

github-actions bot mentioned this pull request Mar 15, 2026

📊 Bản tin hàng ngày công cụ AI CLI 2026-03-15 compasify/agents-radar#45

Open

Append guardian reviews on reused session

6769b08

Keep follow-up guardian approvals on the same child conversation instead of clearing history between reviews, and update the snapshot to show the appended prior review context. Co-authored-by: Codex <noreply@openai.com>

aibrahim-oai approved these changes Mar 15, 2026

View reviewed changes

tweaks

418b3a9

Avoid expect in guardian approval request serialization

ee1d938

Co-authored-by: Codex <noreply@openai.com>

chatgpt-codex-connector bot reviewed Mar 15, 2026

View reviewed changes

codex-rs/core/src/guardian/review_session.rs Outdated Show resolved Hide resolved

codex-rs/core/src/config/mod.rs Outdated Show resolved Hide resolved

charley-oai and others added 2 commits March 15, 2026 16:39

codex: fix CI failure on PR #14668

f14fb8a

Co-authored-by: Codex <noreply@openai.com>

codex: stabilize guardian snapshot in Bazel

2b95cea

Co-authored-by: Codex <noreply@openai.com>

chatgpt-codex-connector bot reviewed Mar 16, 2026

View reviewed changes

codex-rs/core/src/guardian/review_session.rs Outdated Show resolved Hide resolved

codex-rs/core/src/config/mod.rs Outdated Show resolved Hide resolved

codex: remove guardian serialization panic

ed8bfae

Co-authored-by: Codex <noreply@openai.com>

This was referenced Mar 16, 2026

📊 AI CLI 工具社区动态日报 2026-03-16 gsscsd/big_model_radar#43

Open

📊 Bản tin hàng ngày công cụ AI CLI 2026-03-16 compasify/agents-radar#50

Open

Handle concurrent guardian reviews with ephemeral forks

c0a6417

Co-authored-by: Codex <noreply@openai.com>

chatgpt-codex-connector bot reviewed Mar 16, 2026

View reviewed changes

codex-rs/core/src/guardian/review_session.rs Show resolved Hide resolved

codex-rs/core/src/config/mod.rs Outdated Show resolved Hide resolved

Tighten guardian review session cleanup and tests

9822da0

Co-authored-by: Codex <noreply@openai.com>

chatgpt-codex-connector bot reviewed Mar 16, 2026

View reviewed changes

codex-rs/core/src/guardian/review_session.rs Show resolved Hide resolved

codex-rs/core/src/config/mod.rs Outdated Show resolved Hide resolved

codex: address PR review feedback (#14668)

fd34cad

Co-authored-by: Codex <noreply@openai.com>

charley-oai merged commit 6fdeb1d into main Mar 16, 2026
32 checks passed

charley-oai deleted the ccunningham/reuse-guardian-session branch March 16, 2026 05:56

github-actions bot locked and limited conversation to collaborators Mar 16, 2026

Conversation

charley-oai commented Mar 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Request

charley-oai commented Mar 14, 2026

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

charley-oai commented Mar 14, 2026

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

charley-oai commented Mar 14, 2026

charley-oai Mar 14, 2026

Choose a reason for hiding this comment

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

charley-oai commented Mar 15, 2026

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

charley-oai commented Mar 15, 2026

chatgpt-codex-connector bot commented Mar 15, 2026

charley-oai commented Mar 15, 2026

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

charley-oai commented Mar 16, 2026

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

charley-oai commented Mar 16, 2026

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

charley-oai commented Mar 16, 2026

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

charley-oai commented Mar 16, 2026

Uh oh!

Labels

2 participants

charley-oai commented Mar 14, 2026 •

edited

Loading