mirror of
https://github.com/openai/codex.git
synced 2026-11-14 21:40:39 +00:00
## Summary - Replace the manual `/notify-owner` flow with an inline confirmation prompt when a usage-based workspace member hits a credits-depleted limit. - Fetch the current workspace role from the live ChatGPT `accounts/check/v4-2023-04-27` endpoint so owner/member behavior matches the desktop and web clients. - Keep owner, member, and spend-cap messaging distinct so we only offer the owner nudge when the workspace is actually out of credits. ## What Changed - `backend-client` - Added a typed fetch for the current account role from `accounts/check`. - Mapped backend role values into a Rust workspace-role enum. - `app-server` and protocol - Added `workspaceRole` to `account/read` and `account/updated`. - Derived `isWorkspaceOwner` from the live role, with a fallback to the cached token claim when the role fetch is unavailable. - `tui` - Removed the explicit `/notify-owner` slash command. - When a member is blocked because the workspace is out of credits, the error now prompts: - `Your workspace is out of credits. Request more from your workspace owner? [y/N]` - Choosing `y` sends the existing owner-notification request. - Choosing `n`, pressing `Esc`, or accepting the default selection dismisses the prompt without sending anything. - Selection popups now honor explicit item shortcuts, which is how the `y` / `n` interaction is wired. ## Reviewer Notes - The main behavior change is scoped to usage-based workspace members whose workspace credits are depleted. - Spend-cap reached should not show the owner-notification prompt. - Owners and admins should continue to see `/usage` guidance instead of the member prompt. - The live role fetch is best-effort; if it fails, we fall back to the existing token-derived ownership signal. ## Testing - Manual verification - Workspace owner does not see the member prompt. - Workspace member with depleted credits sees the confirmation prompt and can send the nudge with `y`. - Workspace member with spend cap reached does not see the owner-notification prompt. ### Workspace member out of usage https://github.com/user-attachments/assets/341ac396-eff4-4a7f-bf0c-60660becbea1 ### Workspace owner <img width="1728" height="1086" alt="Screenshot 2026-04-09 at 11 48 22 AM" src="https://github.com/user-attachments/assets/06262a45-e3fc-4cc4-8326-1cbedad46ed6" />
122 lines
3.6 KiB
Rust
122 lines
3.6 KiB
Rust
use codex_backend_client::Client as BackendClient;
|
|
use codex_backend_client::RequestError;
|
|
use codex_backend_client::WorkspaceRole as BackendWorkspaceRole;
|
|
use codex_login::AuthManager;
|
|
use codex_login::CodexAuth;
|
|
use thiserror::Error;
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
pub enum WorkspaceRole {
|
|
AccountOwner,
|
|
AccountAdmin,
|
|
StandardUser,
|
|
}
|
|
|
|
impl WorkspaceRole {
|
|
fn is_workspace_owner(self) -> bool {
|
|
matches!(self, Self::AccountOwner | Self::AccountAdmin)
|
|
}
|
|
}
|
|
|
|
impl From<BackendWorkspaceRole> for WorkspaceRole {
|
|
fn from(value: BackendWorkspaceRole) -> Self {
|
|
match value {
|
|
BackendWorkspaceRole::AccountOwner => Self::AccountOwner,
|
|
BackendWorkspaceRole::AccountAdmin => Self::AccountAdmin,
|
|
BackendWorkspaceRole::StandardUser => Self::StandardUser,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
|
|
pub struct WorkspaceOwnership {
|
|
pub workspace_role: Option<WorkspaceRole>,
|
|
pub is_workspace_owner: Option<bool>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
pub enum AddCreditsNudgeEmailStatus {
|
|
Sent,
|
|
CooldownActive,
|
|
}
|
|
|
|
#[derive(Debug, Error)]
|
|
pub enum SendAddCreditsNudgeEmailError {
|
|
#[error("codex account authentication required to notify workspace owner")]
|
|
AuthRequired,
|
|
|
|
#[error("chatgpt authentication required to notify workspace owner")]
|
|
ChatGptAuthRequired,
|
|
|
|
#[error("failed to construct backend client: {0}")]
|
|
CreateClient(#[from] anyhow::Error),
|
|
|
|
#[error("failed to notify workspace owner: {0}")]
|
|
Request(#[from] RequestError),
|
|
}
|
|
|
|
pub async fn send_add_credits_nudge_email(
|
|
chatgpt_base_url: impl Into<String>,
|
|
auth_manager: &AuthManager,
|
|
) -> Result<AddCreditsNudgeEmailStatus, SendAddCreditsNudgeEmailError> {
|
|
let auth = auth_manager
|
|
.auth()
|
|
.await
|
|
.ok_or(SendAddCreditsNudgeEmailError::AuthRequired)?;
|
|
send_add_credits_nudge_email_for_auth(chatgpt_base_url, &auth).await
|
|
}
|
|
|
|
pub async fn send_add_credits_nudge_email_for_auth(
|
|
chatgpt_base_url: impl Into<String>,
|
|
auth: &CodexAuth,
|
|
) -> Result<AddCreditsNudgeEmailStatus, SendAddCreditsNudgeEmailError> {
|
|
if !auth.is_chatgpt_auth() {
|
|
return Err(SendAddCreditsNudgeEmailError::ChatGptAuthRequired);
|
|
}
|
|
|
|
let client = BackendClient::from_auth(chatgpt_base_url, auth)?;
|
|
match client.send_add_credits_nudge_email().await {
|
|
Ok(()) => Ok(AddCreditsNudgeEmailStatus::Sent),
|
|
Err(err) if err.status().is_some_and(|status| status.as_u16() == 429) => {
|
|
Ok(AddCreditsNudgeEmailStatus::CooldownActive)
|
|
}
|
|
Err(err) => Err(err.into()),
|
|
}
|
|
}
|
|
|
|
pub async fn resolve_workspace_role_and_owner_for_auth(
|
|
chatgpt_base_url: &str,
|
|
auth: Option<&CodexAuth>,
|
|
) -> WorkspaceOwnership {
|
|
let token_is_workspace_owner = auth.and_then(CodexAuth::is_workspace_owner);
|
|
let Some(auth) = auth else {
|
|
return WorkspaceOwnership::default();
|
|
};
|
|
|
|
let workspace_role = fetch_current_workspace_role_for_auth(chatgpt_base_url, auth).await;
|
|
let is_workspace_owner = workspace_role
|
|
.map(WorkspaceRole::is_workspace_owner)
|
|
.or(token_is_workspace_owner);
|
|
WorkspaceOwnership {
|
|
workspace_role,
|
|
is_workspace_owner,
|
|
}
|
|
}
|
|
|
|
async fn fetch_current_workspace_role_for_auth(
|
|
chatgpt_base_url: &str,
|
|
auth: &CodexAuth,
|
|
) -> Option<WorkspaceRole> {
|
|
if !auth.is_chatgpt_auth() {
|
|
return None;
|
|
}
|
|
|
|
let client = BackendClient::from_auth(chatgpt_base_url.to_string(), auth).ok()?;
|
|
client
|
|
.get_current_workspace_role()
|
|
.await
|
|
.ok()
|
|
.flatten()
|
|
.map(WorkspaceRole::from)
|
|
}
|