Merge branch 'codex/work-folders-remote-recovery-refresh' into codex/work-folders-session-compat-refresh

* codex/work-folders-remote-recovery-refresh:
  fix: reconcile Git environment keys and shared staging workflow
  test: await chat connection creation after agent selection
This commit is contained in:
Dotta 2026-09-11 16:51:04 -05:00
commit e860742114
3 changed files with 12 additions and 3 deletions

View File

@ -4186,7 +4186,17 @@ done
#[test]
fn github_credentials_cross_only_the_bounded_provider_environment() {
assert_eq!(GITHUB_CREDENTIAL_ENVIRONMENT_KEYS.len(), 95);
assert_eq!(
GITHUB_CREDENTIAL_ENVIRONMENT_KEYS
.iter()
.collect::<std::collections::BTreeSet<_>>()
.len(),
GITHUB_CREDENTIAL_ENVIRONMENT_KEYS.len(),
"provider environment keys must be unique",
);
for key in [
"ZDOTDIR",
"BASH_ENV",
"PAPERCLIP_RUNNER_NETWORK_ACCESS",
"PAPERCLIP_RUNNER_NETWORK_ROOTS",
"PAPERCLIP_GITHUB_AUTH_MODE",

View File

@ -41,8 +41,6 @@ pub(crate) const GITHUB_CREDENTIAL_ENVIRONMENT_KEYS: &[&str] = &[
"GIT_SSH",
"ZDOTDIR",
"BASH_ENV",
"ZDOTDIR",
"BASH_ENV",
"PAPERCLIP_GITHUB_BROKER_URL",
"PAPERCLIP_GITHUB_BROKER_TOKEN",
"PAPERCLIP_GITHUB_LAUNCHER_DIR",

View File

@ -1531,7 +1531,8 @@ test.describe.serial("native chat adapter UI", () => {
).toBeVisible();
await expectSetupRail(page);
await selectMaya(page);
expect(mock.createdWithAgentId).toBe(seed.agentId);
// The selection schedules a request; clicking alone does not await it.
await expect.poll(() => mock.createdWithAgentId).toBe(seed.agentId);
expect(mock.createdWithAgentId).not.toBe(seed.otherAgentId);
await expect(
page.getByRole("button", { name: "Choose an active agent" }),