Skip to content

The open-source agent harness - the runtime layer that turns an LLM into a working agent.

Auto prepend Bearer during MCP connection with API Key and add hints

Chirag Jaind29717b38239
diff --git a/.changeset/mcp-api-key-bearer-hint.md b/.changeset/mcp-api-key-bearer-hint.md
new file mode 100644
index 000000000..fa7e25a60
--- /dev/null
+++ b/.changeset/mcp-api-key-bearer-hint.md
@@ -0,0 +1,5 @@
+---
+'@truefoundry/trueforge-ui': patch
+---
+
+Clarify MCP API key entry: Bearer placeholders, auto-prefix Authorization values, and a header-name hint on the form.
diff --git a/packages/trueforge-ui/src/containers/SettingsBuilder/AddMcpServerForm.tsx b/packages/trueforge-ui/src/containers/SettingsBuilder/AddMcpServerForm.tsx
index 6dbbcae97..491cac7f8 100644
--- a/packages/trueforge-ui/src/containers/SettingsBuilder/AddMcpServerForm.tsx
+++ b/packages/trueforge-ui/src/containers/SettingsBuilder/AddMcpServerForm.tsx
@@ -245,9 +245,13 @@ const AddMcpServerForm = ({ open, onOpenChange, onSubmit, connector, busy = fals
onChange={event => {
setApiKey(event.target.value);
}}
- placeholder="Bearer ..."
+ placeholder="Bearer <Paste the token from the provider>"
+ aria-describedby="mcp-server-api-key-hint"
className={inputClassName}
/>
+ <p id="mcp-server-api-key-hint" className="mt-1.5 text-xs text-text-secondary">
+ {`This is the value for the "${headerName.trim() || 'Authorization'}" header.`}
+ </p>
</div>
<div>
diff --git a/packages/trueforge-ui/src/containers/SettingsBuilder/ConnectorSettings.tsx b/packages/trueforge-ui/src/containers/SettingsBuilder/ConnectorSettings.tsx
index 8715f8c91..b65cfca2e 100644
--- a/packages/trueforge-ui/src/containers/SettingsBuilder/ConnectorSettings.tsx
+++ b/packages/trueforge-ui/src/containers/SettingsBuilder/ConnectorSettings.tsx
@@ -508,7 +508,7 @@ const ConnectorSettings = () => {
onChange={event => {
setApiKey(event.target.value);
}}
- placeholder={`Paste the token from ${connectorAwaitingKey?.name ?? 'the provider'}`}
+ placeholder={`Bearer <Paste the token from ${connectorAwaitingKey?.name ?? 'the provider'}>`}
autoFocus
required
className={auiInputClass('h-11')}
diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/connectorCatalog.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/connectorCatalog.ts
index 48d2edf0a..a1e4c1087 100644
--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/connectorCatalog.ts
+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/connectorCatalog.ts
@@ -23,6 +23,17 @@ export type UiConnectorCatalogEntry = ConnectorCatalogEntry;
const DEFAULT_API_KEY_HEADER = 'Authorization';
+/** Prefixed Authorization values for MCP catalog servers that expect `Bearer …`. */
+function ensureBearerAuthorizationValue({ headerName, value }: { headerName: string; value: string }): string {
+ if (headerName.toLowerCase() !== DEFAULT_API_KEY_HEADER.toLowerCase()) {
+ return value;
+ }
+ if (/^bearer\s+/i.test(value)) {
+ return value;
+ }
+ return `Bearer ${value}`;
+}
+
export function toUiAuthPublic(auth: TrueForgeApi.McpServerManifestAuth | undefined): UiConnectorAuthPublic {
if (auth === undefined) {
return { type: 'none' };
@@ -50,7 +61,10 @@ export function toHarnessAuth(auth: ConnectorAuth): TrueForgeApi.McpServerManife
}
const trimmedHeader = auth.headerName?.trim();
const headerName = trimmedHeader !== undefined && trimmedHeader !== '' ? trimmedHeader : DEFAULT_API_KEY_HEADER;
- return { type: 'header', headers: { [headerName]: apiKey } };
+ return {
+ type: 'header',
+ headers: { [headerName]: ensureBearerAuthorizationValue({ headerName, value: apiKey }) },
+ };
}
export function toUiCatalogEntry(server: TrueForgeApi.CatalogMcpServer): UiConnectorCatalogEntry {
diff --git a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/catalogs/connectorCatalog.test.ts b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/catalogs/connectorCatalog.test.ts
index 77fea178a..d6d9ba1d7 100644
--- a/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/catalogs/connectorCatalog.test.ts
+++ b/packages/trueforge-ui/test/plugins/trueforge-agent-server-adapter/catalogs/connectorCatalog.test.ts
@@ -26,7 +26,11 @@ describe('connectorCatalog mappers', () => {
assert.deepEqual(toHarnessAuth({ type: 'dcr' }), { type: 'dcr' });
assert.deepEqual(toHarnessAuth({ type: 'header', apiKey: 'sk-test' }), {
type: 'header',
- headers: { Authorization: 'sk-test' },
+ headers: { Authorization: 'Bearer sk-test' },
+ });
+ assert.deepEqual(toHarnessAuth({ type: 'header', apiKey: 'Bearer already' }), {
+ type: 'header',
+ headers: { Authorization: 'Bearer already' },
});
assert.deepEqual(toHarnessAuth({ type: 'header', apiKey: 'tok', headerName: 'X-Api-Key' }), {
type: 'header',