Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

fix(connections): clearer Connect sheet header, per-app provider status, why only a key (#6161)

ddupontf4b76494e0dc
diff --git a/apps/cua-spaces-web/src/__tests__/connections-list.test.tsx b/apps/cua-spaces-web/src/__tests__/connections-list.test.tsx
index b9d99c1712..0a557f2815 100644
--- a/apps/cua-spaces-web/src/__tests__/connections-list.test.tsx
+++ b/apps/cua-spaces-web/src/__tests__/connections-list.test.tsx
@@ -228,4 +228,32 @@ describe.skipIf(!wasmBuilt)("the Connect card in a Space thread", () => {
// Nothing was written or run for the sign-in itself.
expect(calls.filter((c) => c.op === "agents.connect")).toEqual([]);
});
+ it("Hermes' picker and sheet tell the truth when only Claude and ChatGPT sign-ins are saved", async () => {
+ await mountApp(path, host([], { threadAuthFailed: true, keys: "none", claudeLogin: "signed-in", chatgptLogin: true }));
+ const card = await waitFor(
+ () => {
+ const r = reply("Hermes needs a connected provider");
+ expect(r).toBeTruthy();
+ return r as HTMLElement;
+ },
+ { timeout: 5000 },
+ );
+ await click(card.querySelector("[data-failure-connect]")!);
+ const sheet = await found("[data-provider-sheet=anthropic]");
+ // Only keys (pasted, or the one in the demo shell), never the Claude sign-in, and one plain sentence on why.
+ expect(qa("[data-provider-way]").map((w) => w.dataset.providerWay)).toEqual(["key", "shell"]);
+ expect(q("[data-provider-only-key]")!.textContent).toBe("Hermes uses an API key. Your Claude sign-in is used by Claude Code.");
+ // The header is a header: a title and a small works-with line, no tile like the option rows have.
+ const header = sheet.querySelector("[data-provider-sheet-header]")!;
+ expect(header.querySelector("[data-harness-mark]")).toBeNull();
+ expect(header.querySelector("[data-provider-works-with]")!.textContent).toMatch(/^Works with /);
+ expect(sheet.textContent).not.toContain("\u00b7");
+ await click(q("[data-provider-switch]")!);
+ await found("[data-provider-picker]");
+ for (const id of ["anthropic", "openai"]) {
+ const row = await found(`[data-provider-choice=${id}]`);
+ expect(row.textContent).toContain("Hermes needs an API key");
+ expect(row.textContent).not.toContain("Connected");
+ }
+ });
});
diff --git a/apps/cua-spaces-web/src/bridge/adapters/demo.ts b/apps/cua-spaces-web/src/bridge/adapters/demo.ts
index a288bad421..361a33d5d8 100644
--- a/apps/cua-spaces-web/src/bridge/adapters/demo.ts
+++ b/apps/cua-spaces-web/src/bridge/adapters/demo.ts
@@ -80,6 +80,8 @@ export interface DemoOptions {
/** Claude Code's sign-in on this Mac: imported already (`?demo=claude-signed-in`), imported and run out (`?demo=claude-expired`),
* or none to import (`?demo=claude-none`: Connect finds nothing and offers the ways on). Default: there is one, not imported yet. */
claudeLogin?: "signed-in" | "expired" | "none";
+ /** `?demo=chatgpt-signed-in`: a ChatGPT sign-in is saved for Codex (no OpenAI API key unless `no-keys` is left off). */
+ chatgptLogin?: boolean;
/** Which connections are saved: `none` (`?demo=no-keys`, an empty Connections list) or `several` (`?demo=connections`: Anthropic, OpenRouter, a custom endpoint and a DeepSeek key the provider refuses). Default: an OpenAI key. */
keys?: "none" | "several";
/** Start with no Spaces (the first-Space empty state). */
@@ -232,6 +234,7 @@ export function demoOptionsFromSearch(search: string): DemoOptions {
...(flags.has("rejected-key") ? { rejectedKeys: ["OPENAI_API_KEY"] } : {}),
...(flags.has("no-keys") ? { keys: "none" as const } : flags.has("connections") ? { keys: "several" as const, rejectedKeys: ["DEEPSEEK_API_KEY"] } : {}),
...(flags.has("claude-expired") ? { claudeLogin: "expired" as const } : flags.has("claude-signed-in") ? { claudeLogin: "signed-in" as const } : flags.has("claude-none") ? { claudeLogin: "none" as const } : {}),
+ ...(flags.has("chatgpt-signed-in") ? { chatgptLogin: true } : {}),
noSpaces: flags.has("empty"),
...(() => {
const scale = [...flags].find((f) => /^scale-\d+$/.test(f));
@@ -344,7 +347,7 @@ export function createDemoAdapter(options: DemoOptions = {}): DataAdapter & { re
// A named allowance is for showing the prompts, which wait for no agent run.
runs: options.usage ? [] : demoRunRecords(now()),
imported: [],
- keyStore: demoKeyStore(now, options.rejectedKeys ?? [], options.claudeLogin, options.keys),
+ keyStore: demoKeyStore(now, options.rejectedKeys ?? [], options.claudeLogin, options.keys, options.chatgptLogin),
readOnlyAgents: options.agentsReadOnly ?? [],
agentSetup: demoAgentSetup(options.onboarded === false || options.agents === "unset", options.agents === "none" ? [] : options.agents === "codex" ? ["codex"] : null),
platform: options.platform ?? MAC_DEMO_PLATFORM,
diff --git a/apps/cua-spaces-web/src/bridge/adapters/demo/agent-keys.ts b/apps/cua-spaces-web/src/bridge/adapters/demo/agent-keys.ts
index ca14ccdbc9..de67e0d303 100644
--- a/apps/cua-spaces-web/src/bridge/adapters/demo/agent-keys.ts
+++ b/apps/cua-spaces-web/src/bridge/adapters/demo/agent-keys.ts
@@ -33,13 +33,15 @@ const SEVERAL = (now: () => number): AgentKeyInfo[] => [
{ provider: "custom", env: "CUSTOM_ENDPOINT_API_KEY", last4: "", addedMs: now() - DAY, fields: { base_url: "http://192.168.1.20:1234/v1", model: "qwen3-coder", wire: "openai-chat" } },
];
-export const demoKeyStore = (now: () => number, rejected: string[] = [], claude?: "signed-in" | "expired" | "none", keys?: "none" | "several"): DemoKeyStore => ({
+export const demoKeyStore = (now: () => number, rejected: string[] = [], claude?: "signed-in" | "expired" | "none", keys?: "none" | "several", chatgpt?: boolean): DemoKeyStore => ({
keys: [
...(keys === "none" ? [] : keys === "several" ? SEVERAL(now) : [{ provider: "openai", env: "OPENAI_API_KEY", last4: "3f9a", addedMs: now() - 6 * DAY }]),
// The sign-in imported from Claude Code (`?demo=claude-signed-in`), or one that ran out (`?demo=claude-expired`).
...(claude === "signed-in" || claude === "expired"
? [{ provider: "other" as const, env: "CLAUDE_CODE_OAUTH_TOKEN", last4: "", addedMs: now() - 26 * 3600_000, label: "Signed in as [email protected] (Claude Max)", ...(claude === "expired" ? { expired: true } : {}) }]
: []),
+ // The ChatGPT sign-in made for Codex (`?demo=chatgpt-signed-in`): Codex's alone, never an API key.
+ ...(chatgpt ? [{ provider: "other" as const, env: "CODEX_AUTH_JSON", last4: "", addedMs: now() - 3 * 3600_000, label: "Signed in with ChatGPT" }] : []),
],
rejected,
});
diff --git a/apps/cua-spaces-web/src/bridge/connectors.ts b/apps/cua-spaces-web/src/bridge/connectors.ts
index 9063ebac22..1ac1d502d7 100644
--- a/apps/cua-spaces-web/src/bridge/connectors.ts
+++ b/apps/cua-spaces-web/src/bridge/connectors.ts
@@ -184,6 +184,8 @@ export interface ProviderSheetView {
note: string | null;
/** "Other providers": opens the provider choice. */
switchLabel: string;
+ /** Why only a key is offered, when this app can't use the provider's sign-in. */
+ onlyKeyNote: string | null;
}
export interface ProviderChoice {
diff --git a/apps/cua-spaces-web/src/components/agents/harness-mark.tsx b/apps/cua-spaces-web/src/components/agents/harness-mark.tsx
index 073d4ade81..2c8439d876 100644
--- a/apps/cua-spaces-web/src/components/agents/harness-mark.tsx
+++ b/apps/cua-spaces-web/src/components/agents/harness-mark.tsx
@@ -69,8 +69,10 @@ export function AppMarkImage({ agent, className }: { agent: string; className?:
}
/** A coding app's logo in a small tile; a neutral initial tile when there is no logo. */
-export function HarnessMark({ agent, name, large }: { agent: string; name: string; large?: boolean }) {
+export function HarnessMark({ agent, name, large, plain }: { agent: string; name: string; large?: boolean; plain?: boolean }) {
const has = agent in APP_MARKS;
+ // In a header: just the logo, no tile (a tile reads as something to pick).
+ if (plain) return has ? <AppMarkImage agent={agent} className="size-5 shrink-0" /> : null;
return (
<span
className={cn(
diff --git a/apps/cua-spaces-web/src/components/settings/connections/provider-mark.tsx b/apps/cua-spaces-web/src/components/settings/connections/provider-mark.tsx
index 87d9047212..ff9bbd1e6a 100644
--- a/apps/cua-spaces-web/src/components/settings/connections/provider-mark.tsx
+++ b/apps/cua-spaces-web/src/components/settings/connections/provider-mark.tsx
@@ -12,10 +12,10 @@ const MARK_OF: Record<string, string> = {
};
/** A provider in a small tile: its maker's mark where there is one, else a neutral tile with its initial. */
-export function ProviderMark({ id, name, large }: { id: string; name: string; large?: boolean }) {
+export function ProviderMark({ id, name, large, plain }: { id: string; name: string; large?: boolean; plain?: boolean }) {
return (
<span data-provider-mark={id} className="contents">
- <HarnessMark agent={MARK_OF[id] ?? `provider:${id}`} name={name} large={large} />
+ <HarnessMark agent={MARK_OF[id] ?? `provider:${id}`} name={name} large={large} plain={plain} />
</span>
);
}
diff --git a/apps/cua-spaces-web/src/components/settings/connections/provider-sheet.tsx b/apps/cua-spaces-web/src/components/settings/connections/provider-sheet.tsx
index d2bc23b4bb..c558a6b84e 100644
--- a/apps/cua-spaces-web/src/components/settings/connections/provider-sheet.tsx
+++ b/apps/cua-spaces-web/src/components/settings/connections/provider-sheet.tsx
@@ -418,16 +418,18 @@ function ProviderSheet() {
</form>
) : (
<>
- <div className="flex items-center gap-3">
- <ProviderMark id={v.provider} name={v.title.replace(/^Connect /, "")} large />
- <div className="min-w-0 flex-1">
- <DialogTitle className="text-[15px] font-semibold" data-provider-sheet-title="">
- {v.title}
- </DialogTitle>
- {v.lede ? <DialogDescription className="mt-0.5 text-[13px] text-muted-foreground">{v.lede}</DialogDescription> : null}
- </div>
- </div>
- <div className="mt-3">
+ <header data-provider-sheet-header="">
+ <DialogTitle className="flex items-center gap-2 text-[15px] font-semibold" data-provider-sheet-title="">
+ <ProviderMark id={v.provider} name={v.title.replace(/^Connect /, "")} plain />
+ {v.title}
+ </DialogTitle>
+ {v.lede ? (
+ <DialogDescription className="mt-1.5 text-xs text-muted-foreground" data-provider-works-with="">
+ {v.lede}
+ </DialogDescription>
+ ) : null}
+ </header>
+ <div className="mt-4">
{v.ways.map((w) => {
const Icon = ICON[w.id];
return (
@@ -451,6 +453,11 @@ function ProviderSheet() {
);
})}
</div>
+ {v.onlyKeyNote ? (
+ <p className="mt-2 text-xs text-muted-foreground" data-provider-only-key="">
+ {v.onlyKeyNote}
+ </p>
+ ) : null}
<div className="mt-4 flex justify-end gap-2">
{switcher}
<Button variant="outline" onClick={close}>
diff --git a/libs/cua/crates/cua-spaces-app-core/src/connectors.rs b/libs/cua/crates/cua-spaces-app-core/src/connectors.rs
index 99668de7ac..39a63ef1d8 100644
--- a/libs/cua/crates/cua-spaces-app-core/src/connectors.rs
+++ b/libs/cua/crates/cua-spaces-app-core/src/connectors.rs
@@ -363,6 +363,38 @@ fn endpoint_connected(input: &ConnectorsInput, p: &reg::Provider, harness: &str)
&& k.fields.get("model").is_some_and(|v| !v.is_empty()))
}
+/// Whether `app` can use what is saved for `p` now: a credential it reads
+/// (the harness's `reads`), or an endpoint it is pointed at.
+///
+/// A provider being connected is not the same: a Claude or ChatGPT sign-in
+/// connects Anthropic or OpenAI, but Hermes reads only their API keys.
+fn provider_usable_by(input: &ConnectorsInput, p: &reg::Provider, app: &str) -> bool {
+ let Some(a) = app_sign_in(app) else {
+ return provider_credential(input, p).is_some();
+ };
+ if a.reads.is_empty() {
+ return provider_credential(input, p).is_some();
+ }
+ let harness = harness_of_app(app).unwrap_or_default();
+ let envs = provider_envs(p);
+ a.reads
+ .iter()
+ .any(|k| envs.contains(k) && input.key(k).is_some_and(|k| !k.expired))
+ || endpoint_connected(input, p, harness)
+}
+
+/// What is saved for `p` that `app` reads has stopped working.
+fn provider_expired_for(input: &ConnectorsInput, p: &reg::Provider, app: &str) -> bool {
+ let Some(a) = app_sign_in(app).filter(|a| !a.reads.is_empty()) else {
+ return provider_expired(input, p);
+ };
+ let envs = provider_envs(p);
+ !provider_usable_by(input, p, app)
+ && a.reads
+ .iter()
+ .any(|k| envs.contains(k) && input.key(k).is_some_and(|k| k.expired))
+}
+
/// The app's sign-in is in place: one of its providers is connected, or it
/// signs in on its own.
///
@@ -1109,6 +1141,10 @@ pub struct ProviderSheetView {
pub note: Option<String>,
/// "Other providers": opens the provider choice (for the app, when opened for one).
pub switch_label: String,
+ /// When opened for an app that cannot use this provider's sign-in, one plain sentence
+ /// saying why only a key is offered ("Hermes uses an API key. Your Claude sign-in is used
+ /// by Claude Code.").
+ pub only_key_note: Option<String>,
}
/// One provider in a choice.
@@ -1340,6 +1376,26 @@ pub fn provider_sheet_on(
)
)
};
+ // An app's own sign-in is that app's alone: say so when this app is shown only the key.
+ let only_key_note = for_app.and_then(|a| {
+ let owner = p.offered().find(|m| {
+ matches!(
+ m.kind,
+ reg::MethodKind::ImportLogin | reg::MethodKind::SubscriptionLogin
+ ) && !m.app.is_empty()
+ && m.app != a
+ })?;
+ let who = input.row_app(a)?.name;
+ let owner_name = input.row_app(owner.app)?.name;
+ let signin = match p.id {
+ "anthropic" => "Claude",
+ "openai" => "ChatGPT",
+ _ => p.name,
+ };
+ Some(format!(
+ "{who} uses an API key. Your {signin} sign-in is used by {owner_name}."
+ ))
+ });
let this = os.this_machine_lower();
let place = vault(os).map(|v| format!("in {v} ")).unwrap_or_default();
Some(ProviderSheetView {
@@ -1362,6 +1418,7 @@ pub fn provider_sheet_on(
)
}),
switch_label: "Other providers".into(),
+ only_key_note,
})
}
@@ -1380,13 +1437,33 @@ pub fn provider_picker(
};
let choice = |p: &reg::Provider| {
let row = provider_row(input, p, true);
+ let (state, status) = match for_app {
+ // Busy and failed rows say what happened; the rest is whether THIS app can use it.
+ Some(app) if row.state != "connecting" && row.state != "failed" => {
+ if provider_usable_by(input, p, app) {
+ ("connected".to_string(), "Connected".to_string())
+ } else if provider_expired_for(input, p, app) {
+ ("not-connected".to_string(), "Needs reconnect".to_string())
+ } else if provider_credential(input, p).is_some() {
+ // Saved for another app (a Claude or ChatGPT sign-in): not usable here.
+ let name = input.row_app(app).map(|a| a.name).unwrap_or_default();
+ (
+ "not-connected".to_string(),
+ format!("{name} needs an API key"),
+ )
+ } else {
+ ("not-connected".to_string(), "Not connected".to_string())
+ }
+ }
+ _ => (row.state, row.status),
+ };
ProviderChoice {
provider: p.id.into(),
label: p.name.into(),
icon: p.icon.into(),
tier: row.tier,
- state: row.state,
- status: row.status,
+ state,
+ status,
}
};
let searching = !query.trim().is_empty();
@@ -1619,12 +1696,15 @@ pub fn app_detail(input: &ConnectorsInput, agent: &str) -> Option<AppDetailView>
let p = s
.providers
.iter()
- .find(|p| provider_connected(input, p.id))
+ .find(|p| provider_usable_by(input, p, agent))
.or(s.providers.first())
.copied();
let pid = p.map(|p| p.id).unwrap_or_default();
let prow = p.map(|p| provider_row(input, p, can_edit));
- let connected = prow.as_ref().is_some_and(|r| r.state == "connected");
+ let usable = p.is_some_and(|p| provider_usable_by(input, p, agent));
+ let connected = usable && prow.as_ref().is_some_and(|r| r.state == "connected");
+ // Saved for another app (a Claude or ChatGPT sign-in), not one this app reads.
+ let other_only = !usable && prow.as_ref().is_some_and(|r| r.state == "connected");
let names: Vec<&str> = s.providers.iter().map(|p| p.name).collect();
let names = if names.len() > 3 && s.way.is_none() {
"a connected provider".to_string()
@@ -1633,10 +1713,13 @@ pub fn app_detail(input: &ConnectorsInput, agent: &str) -> Option<AppDetailView>
};
ConnectorSignIn {
title: format!("Signs in with {names}"),
- status: prow
- .as_ref()
- .map(|r| r.credential.clone().unwrap_or_else(|| r.status.clone()))
- .unwrap_or_default(),
+ status: if other_only {
+ "Needs an API key".to_string()
+ } else {
+ prow.as_ref()
+ .map(|r| r.credential.clone().unwrap_or_else(|| r.status.clone()))
+ .unwrap_or_default()
+ },
connected,
way: way_text(agent).into(),
provider: pid.into(),
@@ -2039,6 +2122,135 @@ mod tests {
assert!(app_signed_in(&a, "hermes") && app_signed_in(&a, "claude-code"));
}
+ fn state_in_picker(i: &ConnectorsInput, app: &str, provider: &str) -> (String, String) {
+ let c = provider_picker(i, Some(app), "", true)
+ .items
+ .into_iter()
+ .find(|c| c.provider == provider)
+ .unwrap();
+ (c.state, c.status)
+ }
+
+ #[test]
+ fn a_picker_opened_for_an_app_shows_whether_that_app_can_use_the_credential() {
+ // A Claude sign-in and a ChatGPT sign-in are saved; no API keys.
+ let mut i = input();
+ i.apps.push(app("hermes", "Hermes", false));
+ i.keys.keys.push(key("CLAUDE_CODE_OAUTH_TOKEN", "AAAA"));
+ i.keys.keys.push(key("CODEX_AUTH_JSON", "BBBB"));
+ // The Connections list still says Anthropic and OpenAI are connected (a sign-in is saved)...
+ let v = view(&i);
+ assert_eq!(
+ v.providers
+ .iter()
+ .find(|p| p.id == "anthropic")
+ .unwrap()
+ .state,
+ "connected"
+ );
+ // ...but Hermes reads only API keys, so its picker must not.
+ for p in ["anthropic", "openai"] {
+ let (state, status) = state_in_picker(&i, "hermes", p);
+ assert_eq!(state, "not-connected", "{p}");
+ assert_eq!(status, "Hermes needs an API key", "{p}");
+ }
+ // The same sign-ins are Claude Code's and Codex's.
+ assert_eq!(
+ state_in_picker(&i, "claude-code", "anthropic").0,
+ "connected"
+ );
+ assert_eq!(state_in_picker(&i, "codex", "openai").0, "connected");
+ // Nothing saved at all: plainly not connected.
+ assert_eq!(
+ state_in_picker(&input(), "hermes", "anthropic"),
+ ("not-connected".into(), "Not connected".into())
+ );
+ // An API key is what Hermes reads.
+ i.keys.keys.push(key("ANTHROPIC_API_KEY", "CCCC"));
+ assert_eq!(
+ state_in_picker(&i, "hermes", "anthropic"),
+ ("connected".into(), "Connected".into())
+ );
+ // An expired API key needs a reconnect; Claude Code's expired sign-in is not Hermes' to reconnect.
+ let mut e = input();
+ let mut k = key("CLAUDE_CODE_OAUTH_TOKEN", "AAAA");
+ k.expired = true;
+ e.keys.keys.push(k);
+ assert_eq!(
+ state_in_picker(&e, "hermes", "anthropic").1,
+ "Not connected"
+ );
+ assert_eq!(
+ state_in_picker(&e, "claude-code", "anthropic").1,
+ "Needs reconnect"
+ );
+ let mut x = input();
+ let mut k = key("ANTHROPIC_API_KEY", "AAAA");
+ k.expired = true;
+ x.keys.keys.push(k);
+ assert_eq!(
+ state_in_picker(&x, "hermes", "anthropic").1,
+ "Needs reconnect"
+ );
+ }
+
+ #[test]
+ fn hermes_page_and_card_need_a_key_it_reads_not_a_sign_in() {
+ let mut i = input();
+ i.keys.keys.push(key("CLAUDE_CODE_OAUTH_TOKEN", "AAAA"));
+ i.keys.keys.push(key("CODEX_AUTH_JSON", "BBBB"));
+ let d = app_detail(&i, "hermes").unwrap();
+ let s = d.sign_in.unwrap();
+ assert!(!s.connected, "{s:?}");
+ assert_ne!(s.status, "Connected");
+ assert!(!signed_in(&i, "hermes"));
+ i.keys.keys.push(key("OPENAI_API_KEY", "CCCC"));
+ assert!(signed_in(&i, "hermes"));
+ assert!(app_detail(&i, "hermes").unwrap().sign_in.unwrap().connected);
+ }
+
+ #[test]
+ fn a_sheet_opened_for_hermes_says_why_only_a_key_is_offered() {
+ let mut i = input();
+ i.apps.push(app("hermes", "Hermes", false));
+ let a = provider_sheet_on(&i, "anthropic", SpaceOs::Macos, Some("hermes")).unwrap();
+ assert_eq!(
+ a.ways.iter().map(|w| w.id.as_str()).collect::<Vec<_>>(),
+ ["key"]
+ );
+ assert_eq!(
+ a.only_key_note.as_deref(),
+ Some("Hermes uses an API key. Your Claude sign-in is used by Claude Code.")
+ );
+ let o = provider_sheet_on(&i, "openai", SpaceOs::Macos, Some("hermes")).unwrap();
+ assert_eq!(
+ o.only_key_note.as_deref(),
+ Some("Hermes uses an API key. Your ChatGPT sign-in is used by OpenAI Codex.")
+ );
+ // Claude Code's own sheet and the Connections list have nothing to explain; nor does a key-only provider.
+ assert!(
+ provider_sheet_on(&i, "anthropic", SpaceOs::Macos, Some("claude-code"))
+ .unwrap()
+ .only_key_note
+ .is_none()
+ );
+ assert!(
+ provider_sheet(&i, "anthropic")
+ .unwrap()
+ .only_key_note
+ .is_none()
+ );
+ assert!(
+ provider_sheet_on(&i, "openrouter", SpaceOs::Macos, Some("hermes"))
+ .unwrap()
+ .only_key_note
+ .is_none()
+ );
+ // No middle dot, no "devices".
+ let all = format!("{a:?}{o:?}");
+ assert!(!all.contains('\u{b7}') && !all.to_lowercase().contains("device"));
+ }
+
#[test]
fn a_sign_in_that_no_longer_works_is_not_connected_and_says_reconnect() {
let mut i = input();