mirror of
https://github.com/davidkaya/aryx.git
synced 2026-11-20 08:21:28 +01:00
feat: add MCP OAuth authentication frontend wiring and banner
- Add McpOauthRequiredEvent and McpOauthStaticClientConfigEvent to sidecar contracts - Add PendingMcpAuthRecord domain type with status tracking (pending/authenticating/failed/done) - Add pendingMcpAuth field to SessionRecord for session-level auth state - Wire onMcpOAuthRequired callback through sidecarProcess, runTurnPending, and AryxAppService - Handle mcp-oauth-required events: set session pendingMcpAuth, clear on turn finalize/cancel - Add dismissSessionMcpAuth IPC channel with preload binding and handler registration - Create McpAuthBanner component (amber-themed, shows server name/URL, dismiss button) - Integrate McpAuthBanner into ChatPane with placeholder text and App.tsx callback - Update test fixtures for new RunTurnPendingCommand.onMcpOAuthRequired field Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 parent
192c28f721
commit
f9757d5ce2
14 files changed
+196
-2
No files matched your search
@@ -29,6 +29,7 @@ export const ipcChannels = {
|
||||
resolveSessionUserInput: 'sessions:resolve-user-input',
|
||||
setSessionInteractionMode: 'sessions:set-interaction-mode',
|
||||
dismissSessionPlanReview: 'sessions:dismiss-plan-review',
|
||||
dismissSessionMcpAuth: 'sessions:dismiss-mcp-auth',
|
||||
querySessions: 'sessions:query',
|
||||
updateSessionModelConfig: 'sessions:update-model-config',
|
||||
selectProject: 'selection:project',
|
||||
|
||||
@@ -116,6 +116,10 @@ export interface DismissSessionPlanReviewInput {
|
||||
sessionId: string;
|
||||
}
|
||||
|
||||
export interface DismissSessionMcpAuthInput {
|
||||
sessionId: string;
|
||||
}
|
||||
|
||||
export interface ElectronApi {
|
||||
describeSidecarCapabilities(): Promise<SidecarCapabilities>;
|
||||
refreshSidecarCapabilities(): Promise<SidecarCapabilities>;
|
||||
@@ -145,6 +149,7 @@ export interface ElectronApi {
|
||||
resolveSessionUserInput(input: ResolveSessionUserInputInput): Promise<WorkspaceState>;
|
||||
setSessionInteractionMode(input: SetSessionInteractionModeInput): Promise<WorkspaceState>;
|
||||
dismissSessionPlanReview(input: DismissSessionPlanReviewInput): Promise<WorkspaceState>;
|
||||
dismissSessionMcpAuth(input: DismissSessionMcpAuthInput): Promise<WorkspaceState>;
|
||||
updateSessionModelConfig(input: UpdateSessionModelConfigInput): Promise<WorkspaceState>;
|
||||
querySessions(input: QuerySessionsInput): Promise<SessionQueryResult[]>;
|
||||
selectProject(projectId?: string): Promise<WorkspaceState>;
|
||||
|
||||
@@ -244,6 +244,23 @@ export interface UserInputRequestedEvent {
|
||||
allowFreeform?: boolean;
|
||||
}
|
||||
|
||||
export interface McpOauthStaticClientConfigEvent {
|
||||
clientId: string;
|
||||
publicClient?: boolean;
|
||||
}
|
||||
|
||||
export interface McpOauthRequiredEvent {
|
||||
type: 'mcp-oauth-required';
|
||||
requestId: string;
|
||||
sessionId: string;
|
||||
oauthRequestId: string;
|
||||
agentId?: string;
|
||||
agentName?: string;
|
||||
serverName: string;
|
||||
serverUrl: string;
|
||||
staticClientConfig?: McpOauthStaticClientConfigEvent;
|
||||
}
|
||||
|
||||
export interface ExitPlanModeRequestedEvent {
|
||||
type: 'exit-plan-mode-requested';
|
||||
requestId: string;
|
||||
@@ -276,6 +293,7 @@ export type SidecarEvent =
|
||||
| AgentActivityEvent
|
||||
| ApprovalRequestedEvent
|
||||
| UserInputRequestedEvent
|
||||
| McpOauthRequiredEvent
|
||||
| ExitPlanModeRequestedEvent
|
||||
| CommandErrorEvent
|
||||
| CommandCompleteEvent;
|
||||
@@ -0,0 +1,19 @@
|
||||
export type McpAuthStatus = 'pending' | 'authenticating' | 'authenticated' | 'failed';
|
||||
|
||||
export interface McpOauthStaticClientConfig {
|
||||
clientId: string;
|
||||
publicClient?: boolean;
|
||||
}
|
||||
|
||||
export interface PendingMcpAuthRecord {
|
||||
id: string;
|
||||
status: McpAuthStatus;
|
||||
agentId?: string;
|
||||
agentName?: string;
|
||||
serverName: string;
|
||||
serverUrl: string;
|
||||
staticClientConfig?: McpOauthStaticClientConfig;
|
||||
requestedAt: string;
|
||||
completedAt?: string;
|
||||
errorMessage?: string;
|
||||
}
|
||||
@@ -13,6 +13,7 @@ import {
|
||||
import type { SessionRunRecord } from '@shared/domain/runTimeline';
|
||||
import type { PendingUserInputRecord } from '@shared/domain/userInput';
|
||||
import type { PendingPlanReviewRecord } from '@shared/domain/planReview';
|
||||
import type { PendingMcpAuthRecord } from '@shared/domain/mcpAuth';
|
||||
import type { InteractionMode } from '@shared/contracts/sidecar';
|
||||
|
||||
export type ChatRole = 'system' | 'user' | 'assistant';
|
||||
@@ -54,6 +55,7 @@ export interface SessionRecord {
|
||||
pendingApprovalQueue?: PendingApprovalRecord[];
|
||||
pendingUserInput?: PendingUserInputRecord;
|
||||
pendingPlanReview?: PendingPlanReviewRecord;
|
||||
pendingMcpAuth?: PendingMcpAuthRecord;
|
||||
runs: SessionRunRecord[];
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user