- {sidebarCollapsed && (
- setSidebarCollapsed(false)}
+ {currentView === 'settings' ? (
+ setSidebarCollapsed(true)}
/>
- )}
-
+
+
+ ) : (
+ <>
+
+ {sidebarCollapsed && (
+ setSidebarCollapsed(false)}
+ />
+ )}
+
+
+ )}
@@ -142,12 +217,31 @@ export const McpListTab: React.FC = () => {
{mcp.error && (
+
+ {mcp.status === 'needs_auth' && (
+
+ )}
))}
diff --git a/packages/desktop/src/renderer/components/SettingsWindow.tsx b/packages/desktop/src/renderer/components/SettingsPage.tsx
similarity index 83%
rename from packages/desktop/src/renderer/components/SettingsWindow.tsx
rename to packages/desktop/src/renderer/components/SettingsPage.tsx
index 619a1f9..c49d147 100644
--- a/packages/desktop/src/renderer/components/SettingsWindow.tsx
+++ b/packages/desktop/src/renderer/components/SettingsPage.tsx
@@ -1,6 +1,7 @@
/**
- * @file src/renderer/components/SettingsWindow.tsx
- * @description 设置中心主窗口，包含通用设置、模型供应商、MCP 服务、Skills 和语音服务五个标签页
+ * @file src/renderer/components/SettingsPage.tsx
+ * @description 设置中心页面组件，嵌入主窗口右侧内容区域
+ * 包含通用设置、模型供应商、MCP 服务、Skills 和语音服务五个标签页
*/
import React, { useEffect, useState } from 'react';
@@ -9,10 +10,11 @@ import { ProviderConfigPanel } from './ProviderConfigPanel';
import { ConfigForm } from './ConfigForm';
import { McpListTab } from './McpListTab';
import { SkillListTab } from './SkillListTab';
+import { VoiceConfigPanel } from './VoiceConfigPanel';
import { useConfigStore } from '../stores/configStore';
import { useProviderStore } from '../stores/providerStore';
+import { useViewStore } from '../stores/viewStore';
import { toast } from '../stores/toastStore';
-import { VoiceConfigPanel } from './VoiceConfigPanel';
type TabKey = 'general' | 'providers' | 'mcp' | 'skills' | 'voice';
@@ -25,12 +27,14 @@ const tabs: { key: TabKey; label: string; icon: React.ReactNode }[] = [
];
/**
- * 设置中心窗口组件，提供通用设置、模型供应商、MCP 服务、Skills 和语音服务五个标签页的切换和内容展示
+ * 设置中心页面组件，嵌入主窗口右侧内容区域
+ * 提供通用设置、模型供应商、MCP 服务、Skills 和语音服务五个标签页的切换和内容展示
*/
-export const SettingsWindow: React.FC = () => {
+export const SettingsPage: React.FC = () => {
const { config, loading, saving, error, loadConfig, saveConfig } =
useConfigStore();
const { saveAllPending } = useProviderStore();
+ const setView = useViewStore((s) => s.setView);
const [activeTab, setActiveTab] = useState{mcp.error}
)} - {mcp.toolCount !== undefined && mcp.toolCount > 0 && ( -- {mcp.toolCount} 个工具可用 -
- )} + {mcp.status === 'connected' && + mcp.toolCount !== undefined && + mcp.toolCount > 0 && ( ++ {mcp.toolCount} 个工具可用 +
+ )}
+
);
@@ -70,14 +74,14 @@ export const SettingsWindow: React.FC = () => {
if (error && !config) {
return (
-
加载中...
+
);
}
return (
-
加载配置失败：{error}
+
{
export interface McpServer {
name: string;
- status: 'connected' | 'disconnected' | 'error';
+ status: 'connected' | 'disconnected' | 'connecting' | 'needs_auth';
toolCount?: number;
error?: string;
}
+export interface McpOAuthStatus {
+ status: McpServer['status'];
+ oauthUrl?: string;
+ error?: string;
+}
+
export interface ListMcpsResponse {
servers: McpServer[];
}
@@ -627,6 +633,50 @@ export async function listMcpServers(): Promise {
return data.servers;
}
+/**
+ * 启动指定 MCP 服务器的 OAuth 授权流程。
+ * 返回授权 URL，前端应使用 shell.openExternal 打开浏览器。
+ * @param name - MCP 服务器名称
+ * @returns 包含授权 URL 的对象
+ */
+export async function startMcpOAuth(
+ name: string
+): Promise<{ authorizationUrl: string }> {
+ const baseUrl = await getBaseUrl();
+ const response = await fetch(
+ `${baseUrl}/api/mcp/${encodeURIComponent(name)}/oauth/authorize`,
+ { method: 'POST', headers: { 'Content-Type': 'application/json' } }
+ );
+
+ if (!response.ok) {
+ const data = await response.json().catch(() => ({}));
+ throw new Error(
+ (data as { error?: string }).error ||
+ `Failed to start OAuth: ${response.status}`
+ );
+ }
+
+ return response.json();
+}
+
+/**
+ * 查询指定 MCP 服务器的 OAuth 授权状态，用于前端轮询。
+ * @param name - MCP 服务器名称
+ */
+export async function getMcpOAuthStatus(name: string): Promise {
+ const baseUrl = await getBaseUrl();
+ const response = await fetch(
+ `${baseUrl}/api/mcp/${encodeURIComponent(name)}/oauth/status`,
+ { method: 'GET', headers: { Accept: 'application/json' } }
+ );
+
+ if (!response.ok) {
+ throw new Error(`Failed to get OAuth status: ${response.status}`);
+ }
+
+ return response.json();
+}
+
/**
* 获取可用的技能列表。
* @returns 技能数组
diff --git a/packages/desktop/src/renderer/stores/configStore.ts b/packages/desktop/src/renderer/stores/configStore.ts
index 12db21b..20aabf5 100644
--- a/packages/desktop/src/renderer/stores/configStore.ts
+++ b/packages/desktop/src/renderer/stores/configStore.ts
@@ -14,7 +14,6 @@ interface RetryConfig {
interface MCPConfig {
connectTimeout: number;
executeTimeout: number;
- sseReadTimeout: number;
}
interface ToolsConfig {
diff --git a/packages/desktop/src/renderer/stores/viewStore.ts b/packages/desktop/src/renderer/stores/viewStore.ts
new file mode 100644
index 0000000..03f5ca1
--- /dev/null
+++ b/packages/desktop/src/renderer/stores/viewStore.ts
@@ -0,0 +1,17 @@
+/**
+ * @file src/renderer/stores/viewStore.ts
+ * @description 主窗口视图状态管理，控制当前显示聊天界面还是设置页面
+ */
+import { create } from 'zustand';
+
+type ViewType = 'chat' | 'settings';
+
+interface ViewStore {
+ currentView: ViewType;
+ setView: (view: ViewType) => void;
+}
+
+export const useViewStore = create()((set) => ({
+ currentView: 'chat',
+ setView: (view) => set({ currentView: view }),
+}));
diff --git a/packages/desktop/src/renderer/stores/voiceStore.ts b/packages/desktop/src/renderer/stores/voiceStore.ts
index 8af4ebd..646426b 100644
--- a/packages/desktop/src/renderer/stores/voiceStore.ts
+++ b/packages/desktop/src/renderer/stores/voiceStore.ts
@@ -1,7 +1,7 @@
/**
* @file stores/voiceStore.ts
* @description 语音状态管理，负责 API Key 持久化、语音开关、TTS 合成和摘要
- * 语音开关状态通过 zustand persist 中间件持久化到 localStorage，重启后自动恢复
+ * 所有语音相关状态（包括 API Key、开关、阈值）统一通过 zustand persist 中间件持久化到 localStorage，重启后自动恢复
*/
import { create } from 'zustand';
@@ -13,13 +13,11 @@ import { audioPlayer } from '../lib/audio-player';
import { toast } from './toastStore';
import { logger } from '../lib/logger';
-const VOICE_API_KEY_STORAGE_KEY = 'minimax-voice-api-key';
const DEFAULT_SUMMARY_THRESHOLD = 200;
interface VoiceStore {
voiceApiKey: string | null;
setVoiceApiKey: (key: string) => void;
- loadVoiceApiKey: () => void;
isSpeaking: boolean;
voiceEnabled: boolean;
@@ -47,19 +45,10 @@ export const useVoiceStore = create()(
summaryThreshold: DEFAULT_SUMMARY_THRESHOLD,
/**
- * 从 localStorage 加载 MiniMax API Key 到内存
- */
- loadVoiceApiKey: () => {
- const key = localStorage.getItem(VOICE_API_KEY_STORAGE_KEY);
- set({ voiceApiKey: key });
- },
-
- /**
- * 保存 API Key 到内存和 localStorage
+ * 保存 API Key 到内存（zustand persist 中间件会自动持久化到 localStorage）
* @param key - MiniMax API Key
*/
setVoiceApiKey: (key: string) => {
- localStorage.setItem(VOICE_API_KEY_STORAGE_KEY, key);
set({ voiceApiKey: key });
},
@@ -141,6 +130,7 @@ export const useVoiceStore = create()(
{
name: 'voice-store',
partialize: (state) => ({
+ voiceApiKey: state.voiceApiKey,
voiceEnabled: state.voiceEnabled,
summaryThreshold: state.summaryThreshold,
}),
diff --git a/packages/desktop/src/renderer/types/window.d.ts b/packages/desktop/src/renderer/types/window.d.ts
index e69ab26..1088484 100644
--- a/packages/desktop/src/renderer/types/window.d.ts
+++ b/packages/desktop/src/renderer/types/window.d.ts
@@ -9,13 +9,13 @@ declare global {
};
};
api?: {
- openSettingsWindow: () => Promise;
selectFolder: (options?: {
title?: string;
defaultPath?: string;
}) => Promise;
getServerUrl: () => Promise;
log: (level: string, ...args: unknown[]) => Promise;
+ openExternal: (url: string) => Promise;
proxyFetch: (
url: string,
options: {
diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
index d45525f..2394445 100644
--- a/packages/server/src/index.ts
+++ b/packages/server/src/index.ts
@@ -7,18 +7,12 @@ import { initAllDirsAndFiles, Logger } from './util/index.js';
import { getLogsDir, getConfigPath } from './util/paths.js';
import { loadConfig } from './config/index.js';
import { startServer, httpServer } from './server/index.js';
-
-declare global {
- // 正式编译时通过 Bun --define 注入，开发模式回退为 "dev"
- var SERVER_VERSION: string | undefined;
-}
-
-const version = globalThis.SERVER_VERSION ?? 'dev';
+import { APP_NAME, APP_VERSION } from './util/app.js';
const program = new Command();
program
- .name('persona-agent-server')
- .version(version)
+ .name(APP_NAME)
+ .version(APP_VERSION)
.argument('', 'Port to listen on')
.action(async (portStr: string) => {
const port = parseInt(portStr, 10);
diff --git a/packages/server/src/mcp/config.ts b/packages/server/src/mcp/config.ts
index e2ad64d..7274c46 100644
--- a/packages/server/src/mcp/config.ts
+++ b/packages/server/src/mcp/config.ts
@@ -15,7 +15,7 @@ function isRecord(value: unknown): value is Record {
}
/**
- * Load and parse the MCP configuration file.
+ * Load and parse the MCP config file.
*
* @param configPath - Optional custom path to mcp.json (default: ~/.local/share/persona-agent/mcp/mcp.json)
* @returns A map of server name -> server config, or an empty map if file doesn't exist
diff --git a/packages/server/src/mcp/connection.ts b/packages/server/src/mcp/connection.ts
index f43dee1..737c3d1 100644
--- a/packages/server/src/mcp/connection.ts
+++ b/packages/server/src/mcp/connection.ts
@@ -1,29 +1,28 @@
/**
* @fileoverview MCP server connection and tool wrapper.
*
- * MCPServerConnection manages a single MCP server connection (stdio/sse/streamable_http).
- * MCPTool wraps a remote MCP tool into the local Tool interface.
*/
import { Client } from '@modelcontextprotocol/sdk/client/index.js';
import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
-import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { UnauthorizedError } from '@modelcontextprotocol/sdk/client/auth.js';
import { Logger } from '../util/logger.js';
+import { APP_NAME, APP_VERSION } from '../util/app.js';
import type { Tool, ToolInput, ToolResult, JsonSchema } from '../tools/base.js';
-import type {
- Closable,
- ConnectionType,
- McpClient,
- McpServerConfig,
-} from './types.js';
+import type { ConnectionType, McpClient, McpServerConfig } from './types.js';
+import type { McpOAuthProvider } from './oauth/provider.js';
+//TODO: 这个是写死的配置, 以后要考虑放到前端的服务器设置里面给用户自行配置
const DEFAULT_TIMEOUTS = {
connectTimeout: 60,
executeTimeout: 120,
- sseReadTimeout: 120,
};
+/**
+ * Adapts a remote MCP tool into the local {@link Tool} interface.
+ * Handles execution timeout and error/result normalization.
+ */
export class MCPTool implements Tool {
public name: string;
public description: string;
@@ -46,6 +45,12 @@ export class MCPTool implements Tool {
this.executeTimeoutMs = options.executeTimeoutSec * 1000;
}
+ /**
+ * Execute the tool with the given parameters.
+ *
+ * @param params - Tool input arguments
+ * @returns Normalized result with success/error status
+ */
async execute(params: ToolInput): Promise {
try {
const result = await withTimeout(
@@ -62,8 +67,8 @@ export class MCPTool implements Tool {
return {
success: !isError,
- content,
- error: isError ? 'Tool returned error' : null,
+ content: isError ? '' : content,
+ error: isError ? content || 'Tool returned error' : null,
};
} catch (error: unknown) {
const message = error instanceof Error ? error.message : String(error);
@@ -76,6 +81,10 @@ export class MCPTool implements Tool {
}
}
+/**
+ * Manages a single MCP server connection
+ * Handles connection lifecycle, tool discovery, and OAuth authentication for remote servers.
+ */
export class MCPServerConnection {
public name: string;
public connectionType: ConnectionType;
@@ -87,12 +96,15 @@ export class MCPServerConnection {
public headers: Record;
public connectTimeoutSec?: number;
public executeTimeoutSec?: number;
- public sseReadTimeoutSec?: number;
public tools: MCPTool[] = [];
private session: McpClient | null = null;
- private transport: Closable | null = null;
+ private transport:
+ | StdioClientTransport
+ | StreamableHTTPClientTransport
+ | null = null;
+ private authProvider?: McpOAuthProvider;
constructor(options: {
name: string;
@@ -105,7 +117,7 @@ export class MCPServerConnection {
headers?: Record;
connectTimeoutSec?: number;
executeTimeoutSec?: number;
- sseReadTimeoutSec?: number;
+ authProvider?: McpOAuthProvider;
}) {
this.name = options.name;
this.connectionType = options.connectionType;
@@ -117,7 +129,7 @@ export class MCPServerConnection {
this.headers = options.headers ?? {};
this.connectTimeoutSec = options.connectTimeoutSec;
this.executeTimeoutSec = options.executeTimeoutSec;
- this.sseReadTimeoutSec = options.sseReadTimeoutSec;
+ this.authProvider = options.authProvider;
}
private getConnectTimeoutSec(): number {
@@ -130,9 +142,12 @@ export class MCPServerConnection {
/**
* Create the appropriate transport based on connection type.
- * Supports stdio, sse, and streamable_http transports.
+ *
+ * @throws {Error} If required config (command for stdio, url for remote) is missing
*/
- private createTransport(): Closable {
+ private createTransport():
+ | StdioClientTransport
+ | StreamableHTTPClientTransport {
if (this.connectionType === 'stdio') {
if (!this.command) {
throw new Error('Missing command for stdio transport');
@@ -150,17 +165,8 @@ export class MCPServerConnection {
throw new Error('Missing url for remote transport');
}
- if (this.connectionType === 'sse') {
- return new SSEClientTransport(new URL(this.url), {
- requestInit: {
- headers:
- Object.keys(this.headers).length > 0 ? this.headers : undefined,
- },
- });
- }
-
- // streamable_http (default for URL-based connections)
return new StreamableHTTPClientTransport(new URL(this.url), {
+ authProvider: this.authProvider,
requestInit: {
headers:
Object.keys(this.headers).length > 0 ? this.headers : undefined,
@@ -169,18 +175,21 @@ export class MCPServerConnection {
}
/**
- * Connect to the MCP server, discover available tools, and populate this.tools.
- * Returns true on success, false on failure. On failure, resources are cleaned up.
+ * Connect to the MCP server and discover available tools.
+ *
+ * For remote servers requiring OAuth, returns `{ needsAuth: true }`. Read {@link authorizationUrl} to get the URL, then complete the OAuth flow before calling {@link connect} again.
+ *
+ * @returns Connection result with success status and optional auth requirement
*/
- async connect(): Promise {
+ async connect(): Promise<{ success: boolean; needsAuth?: boolean }> {
const connectTimeoutMs = this.getConnectTimeoutSec() * 1000;
- try {
- const transport = this.createTransport();
- const client = new Client({
- name: 'persona-agent',
- version: '1.0.0',
- }) as unknown as McpClient;
+ const transport = this.createTransport();
+ const client = new Client({
+ name: APP_NAME,
+ version: APP_VERSION,
+ }) as unknown as McpClient;
+ try {
const toolsList = await withTimeout(
(async () => {
await client.connect(transport);
@@ -216,18 +225,31 @@ export class MCPServerConnection {
'MCP',
`Connected to '${this.name}' (${this.connectionType}) - loaded ${this.tools.length} tools`
);
- return true;
+ return { success: true };
} catch (error: unknown) {
+ if (error instanceof UnauthorizedError) {
+ this.transport = transport;
+ Logger.log(
+ 'MCP',
+ `Server '${this.name}' requires OAuth authentication`
+ );
+ if (client?.close) {
+ await client.close().catch(() => {});
+ }
+ return { success: false, needsAuth: true };
+ }
+
const message = error instanceof Error ? error.message : String(error);
Logger.log(
'ERROR',
`Failed to connect MCP server '${this.name}': ${message}`
);
await this.disconnect();
- return false;
+ return { success: false };
}
}
+ /** Close the session and transport, releasing all resources. */
async disconnect(): Promise {
const session = this.session;
const transport = this.transport;
@@ -241,12 +263,40 @@ export class MCPServerConnection {
await transport.close();
}
}
+
+ /**
+ * Exchange an OAuth authorization code for access tokens.
+ *
+ * @param code - Authorization code from the OAuth callback
+ * @throws {Error} If no active transport or transport doesn't support OAuth
+ */
+ async finishAuth(code: string): Promise {
+ if (!this.transport) {
+ throw new Error('No active transport to finish auth');
+ }
+
+ if (this.transport instanceof StreamableHTTPClientTransport) {
+ Logger.log(
+ 'MCP-OAuth',
+ `Finishing OAuth for '${this.name}' with authorization code`
+ );
+ await this.transport.finishAuth(code);
+ } else {
+ throw new Error('Transport does not support OAuth finishAuth');
+ }
+ }
+
+ /** Authorization URL for the current OAuth flow. Available after {@link connect} returns `{ needsAuth: true }`. */
+ get authorizationUrl(): string | undefined {
+ return this.authProvider?.getAuthorizationUrl();
+ }
}
/**
* Determine the connection type from server config.
- * Normalizes 'http' to 'streamable_http' since both use the same transport.
- * Defaults to 'streamable_http' for URL-based configs, 'stdio' otherwise.
+ *
+ * @param config - MCP server configuration
+ * @returns 'stdio' for command-based configs, 'streamable_http' for URL-based
*/
export function determineConnectionType(
config: McpServerConfig
@@ -256,8 +306,6 @@ export function determineConnectionType(
switch (explicitType) {
case 'stdio':
return 'stdio';
- case 'sse':
- return 'sse';
case 'http':
case 'streamable_http':
return 'streamable_http';
diff --git a/packages/server/src/mcp/index.ts b/packages/server/src/mcp/index.ts
index d5a37bb..622e79a 100644
--- a/packages/server/src/mcp/index.ts
+++ b/packages/server/src/mcp/index.ts
@@ -8,5 +8,7 @@ export {
getMcpServer,
getMcpToolsForServers,
getMcpPromptInfo,
+ startOAuthFlow,
+ getOAuthStatus,
} from './pool.js';
export type { McpServerEntry } from './types.js';
diff --git a/packages/server/src/mcp/loader.ts b/packages/server/src/mcp/loader.ts
index b3885a4..94a8f32 100644
--- a/packages/server/src/mcp/loader.ts
+++ b/packages/server/src/mcp/loader.ts
@@ -3,26 +3,42 @@
*
* Connects to all configured MCP servers concurrently at startup.
* Each connection is independent - a single failure does not affect others.
+ * For remote servers with URLs, creates OAuth providers for authentication support.
*/
import { Logger } from '../util/logger.js';
import { MCPServerConnection, determineConnectionType } from './connection.js';
+import { McpOAuthProvider } from './oauth/provider.js';
+import { getOAuthTokensPath } from '../util/paths.js';
import type { McpServerConfig } from './types.js';
import type { McpConnection, McpToolMeta } from './types.js';
+export interface ConnectResult {
+ name: string;
+ connection?: McpConnection;
+ tools: McpToolMeta[];
+ error?: string;
+ needsAuth?: boolean;
+ oauthUrl?: string;
+ serverConn?: MCPServerConnection;
+}
+
/**
* Connect to a single MCP server and return its connection result.
+ * For remote servers (URL-based), creates an OAuth provider for authentication.
*/
async function connectOne(
name: string,
config: McpServerConfig
-): Promise<{
- name: string;
- connection?: McpConnection;
- tools: McpToolMeta[];
- error?: string;
-}> {
+): Promise {
const connectionType = determineConnectionType(config);
+
+ Logger.log('MCP', `Connecting to '${name}' (${connectionType})...`);
+
+ const authProvider = config.url
+ ? new McpOAuthProvider(name, getOAuthTokensPath())
+ : undefined;
+
const serverConn = new MCPServerConnection({
name,
connectionType,
@@ -34,12 +50,23 @@ async function connectOne(
headers: config.headers,
connectTimeoutSec: config.connect_timeout,
executeTimeoutSec: config.execute_timeout,
- sseReadTimeoutSec: config.sse_read_timeout,
+ authProvider,
});
try {
- const success = await serverConn.connect();
- if (!success) {
+ const result = await serverConn.connect();
+
+ if (result.needsAuth) {
+ return {
+ name,
+ tools: [],
+ needsAuth: true,
+ oauthUrl: serverConn.authorizationUrl,
+ serverConn,
+ };
+ }
+
+ if (!result.success) {
return { name, tools: [], error: 'Connection failed' };
}
@@ -55,7 +82,7 @@ async function connectOne(
disconnect: () => serverConn.disconnect(),
};
- return { name, connection, tools };
+ return { name, connection, tools, serverConn };
} catch (error: unknown) {
const message = error instanceof Error ? error.message : String(error);
Logger.log('ERROR', `Failed to connect MCP server '${name}': ${message}`);
@@ -67,22 +94,11 @@ async function connectOne(
* Connect to all configured MCP servers in parallel.
*
* @param serverConfigs - Map of server name -> config
- * @returns Array of connection results (one per server)
+ * @returns Array of connection results
*/
export async function connectAllServers(
serverConfigs: Map
-): Promise<
- Array<{
- name: string;
- connection?: McpConnection;
- tools: McpToolMeta[];
- error?: string;
- }>
-> {
- if (serverConfigs.size === 0) {
- return [];
- }
-
+): Promise {
Logger.log('MCP', `Connecting to ${serverConfigs.size} MCP servers...`);
const entries = Array.from(serverConfigs.entries());
@@ -91,11 +107,12 @@ export async function connectAllServers(
);
const connectedCount = results.filter((r) => r.connection).length;
- const failedCount = results.length - connectedCount;
+ const needsAuthCount = results.filter((r) => r.needsAuth).length;
+ const failedCount = results.length - connectedCount - needsAuthCount;
Logger.log(
'MCP',
- `MCP connection complete: ${connectedCount} connected, ${failedCount} failed`
+ `MCP connection complete: ${connectedCount} connected, ${needsAuthCount} needs auth, ${failedCount} failed`
);
return results;
diff --git a/packages/server/src/mcp/oauth/callback.ts b/packages/server/src/mcp/oauth/callback.ts
new file mode 100644
index 0000000..472d8c4
--- /dev/null
+++ b/packages/server/src/mcp/oauth/callback.ts
@@ -0,0 +1,79 @@
+/**
+ * @fileoverview Temporary local HTTP server for receiving OAuth callbacks.
+ *
+ * Listens on a random port, waits for the browser to redirect back with
+ * an authorization code, then shuts down.
+ */
+
+import * as http from 'node:http';
+import { Logger } from '../../util/logger.js';
+
+const CALLBACK_TIMEOUT_MS = 5 * 60 * 1000;
+
+const SUCCESS_HTML = `
+
+;
+ close: () => void;
+}
+
+/**
+ * Start a temporary HTTP server on a random port to receive the OAuth callback.
+ *
+ * The caller should:
+ * 1. Read `result.port` to get the actual port number
+ * 2. Configure the provider's redirect URL as `http://localhost:{port}/callback`
+ * 3. Call `result.waitForCode()` to block until the code arrives (or timeout)
+ * 4. Call `result.close()` when done
+ */
+export function startCallbackServer(): Promise {
+ let resolveCode: ((code: string) => void) | undefined;
+ const codePromise = new Promise((resolve) => {
+ resolveCode = resolve;
+ });
+
+ const server = http.createServer((req, res) => {
+ if (!req.url?.startsWith('/callback')) {
+ res.writeHead(404).end();
+ return;
+ }
+
+ const url = new URL(req.url, `http://localhost`);
+ const code = url.searchParams.get('code');
+
+ res.writeHead(200, { 'Content-Type': 'text/html' });
+ res.end(SUCCESS_HTML);
+
+ if (code && resolveCode) {
+ Logger.log('MCP-OAuth', 'OAuth callback received authorization code');
+ resolveCode(code);
+ resolveCode = undefined;
+ }
+ });
+
+ return new Promise((resolve) => {
+ server.listen(0, () => {
+ const addr = server.address();
+ const port = typeof addr === 'object' && addr ? addr.port : 0;
+
+ Logger.log('MCP-OAuth', `OAuth callback server started on port ${port}`);
+
+ const timeoutId = setTimeout(() => {
+ server.close();
+ }, CALLBACK_TIMEOUT_MS);
+
+ resolve({
+ port,
+ waitForCode: () => codePromise,
+ close: () => {
+ clearTimeout(timeoutId);
+ server.close();
+ },
+ });
+ });
+ });
+}
diff --git a/packages/server/src/mcp/oauth/provider.ts b/packages/server/src/mcp/oauth/provider.ts
new file mode 100644
index 0000000..4f1e89c
--- /dev/null
+++ b/packages/server/src/mcp/oauth/provider.ts
@@ -0,0 +1,110 @@
+/**
+ * @fileoverview OAuthClientProvider implementation for MCP remote servers.
+ *
+ * Each remote MCP server gets its own provider instance bound to persistent storage.
+ * When SDK requires a browser redirect, the authorization URL is saved to a field
+ * instead of opening the browser directly — the pool layer handles browser launching.
+ */
+
+import type {
+ OAuthClientInformationMixed,
+ OAuthClientMetadata,
+ OAuthTokens,
+} from '@modelcontextprotocol/sdk/shared/auth.js';
+import type { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
+import * as storage from './storage.js';
+import { Logger } from '../../util/logger.js';
+import { APP_NAME } from '../../util/app.js';
+
+export class McpOAuthProvider implements OAuthClientProvider {
+ private serverName: string;
+ private filePath: string;
+
+ /**
+ * Set by setRedirectUrl() after the callback server starts.
+ * The port is unknown until the server binds to a random port.
+ */
+ private _redirectUrl: string | undefined;
+
+ /**
+ * Saved by redirectToAuthorization().
+ * The pool layer reads this via getAuthorizationUrl() to open the browser.
+ */
+ private _authorizationUrl: string | undefined;
+
+ constructor(serverName: string, filePath: string) {
+ this.serverName = serverName;
+ this.filePath = filePath;
+ this._redirectUrl = 'http://localhost:0/callback';
+ }
+
+ get redirectUrl(): string | undefined {
+ return this._redirectUrl;
+ }
+
+ get clientMetadata(): OAuthClientMetadata {
+ return {
+ redirect_uris: this._redirectUrl ? [this._redirectUrl] : [],
+ token_endpoint_auth_method: 'none',
+ grant_types: ['authorization_code', 'refresh_token'],
+ client_name: `${APP_NAME}-mcp-${this.serverName}`,
+ };
+ }
+
+ clientInformation(): OAuthClientInformationMixed | undefined {
+ return storage.loadClientInfo(this.filePath, this.serverName);
+ }
+
+ saveClientInformation(clientInformation: OAuthClientInformationMixed): void {
+ storage.saveClientInfo(this.filePath, this.serverName, clientInformation);
+ }
+
+ tokens(): OAuthTokens | undefined {
+ return storage.loadTokens(this.filePath, this.serverName);
+ }
+
+ saveTokens(tokens: OAuthTokens): void {
+ storage.saveTokens(this.filePath, this.serverName, tokens);
+ }
+
+ codeVerifier(): string {
+ return storage.loadCodeVerifier(this.filePath, this.serverName) ?? '';
+ }
+
+ saveCodeVerifier(codeVerifier: string): void {
+ storage.saveCodeVerifier(this.filePath, this.serverName, codeVerifier);
+ }
+
+ /**
+ * Called by SDK when user needs to visit the authorization page.
+ * Instead of opening the browser here, we save the URL for the pool
+ * layer to pick up and handle browser launching.
+ */
+ redirectToAuthorization(authorizationUrl: URL): void {
+ this._authorizationUrl = authorizationUrl.toString();
+ Logger.log(
+ 'MCP-OAuth',
+ `Redirecting to authorization: ${this._authorizationUrl}`
+ );
+ }
+
+ invalidateCredentials(
+ scope: 'all' | 'client' | 'tokens' | 'verifier' | 'discovery'
+ ): void {
+ if (scope === 'all') {
+ storage.clearOAuthData(this.filePath, this.serverName);
+ return;
+ }
+ // Partial scope clearing will be implemented in Stage 6.
+ // For now, fall through to full clear.
+ storage.clearOAuthData(this.filePath, this.serverName);
+ }
+
+ getAuthorizationUrl(): string | undefined {
+ return this._authorizationUrl;
+ }
+
+ setRedirectUrl(url: string): void {
+ this._redirectUrl = url;
+ }
+}
diff --git a/packages/server/src/mcp/oauth/storage.ts b/packages/server/src/mcp/oauth/storage.ts
new file mode 100644
index 0000000..ef35a51
--- /dev/null
+++ b/packages/server/src/mcp/oauth/storage.ts
@@ -0,0 +1,126 @@
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { Logger } from '../../util/logger.js';
+import type {
+ OAuthClientInformationMixed,
+ OAuthTokens,
+} from '@modelcontextprotocol/sdk/shared/auth.js';
+import type { OAuthStorageEntry } from './types.js';
+
+/**
+ * In-memory cache keyed by server name.
+ * Entries are loaded from file on first access and kept in sync on writes.
+ * A `null` value indicates the entry has been deleted.
+ */
+const cache = new Map();
+
+/** Read the entire OAuth tokens file from disk. Returns empty object if missing. */
+function loadAll(filePath: string): Record {
+ if (!fs.existsSync(filePath)) {
+ return {};
+ }
+ const content = fs.readFileSync(filePath, 'utf8');
+ if (!content.trim()) {
+ return {};
+ }
+ return JSON.parse(content) as Record;
+}
+
+/** Write the entire data map to disk, creating parent directories if needed. */
+function saveAll(
+ filePath: string,
+ data: Record
+): void {
+ const dir = path.dirname(filePath);
+ if (!fs.existsSync(dir)) {
+ fs.mkdirSync(dir, { recursive: true });
+ }
+ fs.writeFileSync(filePath, JSON.stringify(data, null, 2));
+}
+
+/**
+ * Get a single server's OAuth entry.
+ * Returns from cache if available, otherwise reads from file.
+ * Returns an empty object (all fields undefined) for non-existent entries.
+ */
+function getEntry(filePath: string, name: string): OAuthStorageEntry {
+ const cached = cache.get(name);
+ if (cached !== undefined) {
+ return cached ?? {};
+ }
+ const all = loadAll(filePath);
+ const entry = all[name] ?? {};
+ cache.set(name, Object.keys(entry).length > 0 ? entry : null);
+ return entry;
+}
+
+/** Update a server's entry in both cache and file. */
+function setEntry(
+ filePath: string,
+ name: string,
+ entry: OAuthStorageEntry
+): void {
+ cache.set(name, entry);
+ const all = loadAll(filePath);
+ all[name] = entry;
+ saveAll(filePath, all);
+}
+
+export function loadTokens(
+ filePath: string,
+ name: string
+): OAuthTokens | undefined {
+ return getEntry(filePath, name).tokens;
+}
+
+export function saveTokens(
+ filePath: string,
+ name: string,
+ tokens: OAuthTokens
+): void {
+ const entry = getEntry(filePath, name);
+ setEntry(filePath, name, { ...entry, tokens });
+ Logger.log('MCP-OAuth', `Saved OAuth tokens for '${name}'`);
+}
+
+export function loadClientInfo(
+ filePath: string,
+ name: string
+): OAuthClientInformationMixed | undefined {
+ return getEntry(filePath, name).clientInfo;
+}
+
+export function saveClientInfo(
+ filePath: string,
+ name: string,
+ clientInfo: OAuthClientInformationMixed
+): void {
+ const entry = getEntry(filePath, name);
+ setEntry(filePath, name, { ...entry, clientInfo });
+ Logger.log('MCP-OAuth', `Saved OAuth client info for '${name}'`);
+}
+
+export function loadCodeVerifier(
+ filePath: string,
+ name: string
+): string | undefined {
+ return getEntry(filePath, name).codeVerifier;
+}
+
+export function saveCodeVerifier(
+ filePath: string,
+ name: string,
+ codeVerifier: string
+): void {
+ const entry = getEntry(filePath, name);
+ setEntry(filePath, name, { ...entry, codeVerifier });
+}
+
+/** Remove all OAuth data for a server from both cache and file. */
+export function clearOAuthData(filePath: string, name: string): void {
+ cache.set(name, null);
+ const all = loadAll(filePath);
+ delete all[name];
+ saveAll(filePath, all);
+ Logger.log('MCP-OAuth', `Cleared OAuth data for '${name}'`);
+}
diff --git a/packages/server/src/mcp/oauth/types.ts b/packages/server/src/mcp/oauth/types.ts
new file mode 100644
index 0000000..94b8ece
--- /dev/null
+++ b/packages/server/src/mcp/oauth/types.ts
@@ -0,0 +1,10 @@
+import type {
+ OAuthClientInformationMixed,
+ OAuthTokens,
+} from '@modelcontextprotocol/sdk/shared/auth.js';
+
+export interface OAuthStorageEntry {
+ tokens?: OAuthTokens;
+ clientInfo?: OAuthClientInformationMixed;
+ codeVerifier?: string;
+}
diff --git a/packages/server/src/mcp/pool.ts b/packages/server/src/mcp/pool.ts
index d021fe1..8f20bba 100644
--- a/packages/server/src/mcp/pool.ts
+++ b/packages/server/src/mcp/pool.ts
@@ -1,20 +1,32 @@
/**
* @fileoverview MCP Connection Pool - global singleton for managing MCP server connections.
*
-
+ * Manages server lifecycle including OAuth authentication for remote servers.
+ * When a remote MCP server requires OAuth, the pool coordinates the full flow:
+ * callback server → browser redirect → token exchange → reconnection.
*/
import { Logger } from '../util/logger.js';
import { loadMcpConfig } from './config.js';
import { connectAllServers } from './loader.js';
-import type { McpServerEntry } from './types.js';
+import { MCPServerConnection } from './connection.js';
+import { McpOAuthProvider } from './oauth/provider.js';
+import { startCallbackServer } from './oauth/callback.js';
+import { getOAuthTokensPath } from '../util/paths.js';
+import type { McpServerEntry, McpToolMeta, McpConnection } from './types.js';
import type { Tool } from '../tools/base.js';
+const OAUTH_TIMEOUT_MS = 5 * 60 * 1000;
+
const serverEntries: Map = new Map();
const connections: Map<
string,
{ name: string; tools: Tool[]; disconnect: () => Promise }
> = new Map();
+const serverConnections: Map = new Map();
+
+const pendingOAuth: Map = new Map();
+
let initialized = false;
/**
@@ -23,14 +35,11 @@ let initialized = false;
* Safe to call multiple times - subsequent calls are no-ops.
*/
export async function initMcpPool(): Promise {
- if (initialized) {
- return;
- }
+ if (initialized) return;
const serverConfigs = loadMcpConfig();
if (serverConfigs.size === 0) {
Logger.log('MCP', 'No MCP servers to connect');
- initialized = true;
return;
}
@@ -43,24 +52,36 @@ export async function initMcpPool(): Promise {
});
}
- initialized = true;
-
const results = await connectAllServers(serverConfigs);
for (const result of results) {
const entry = serverEntries.get(result.name);
if (!entry) continue;
+ if (result.serverConn) {
+ serverConnections.set(result.name, result.serverConn);
+ }
+
if (result.connection) {
connections.set(result.name, result.connection);
entry.status = 'connected';
entry.tools = result.tools;
entry.error = undefined;
+ } else if (result.needsAuth) {
+ entry.status = 'needs_auth';
+ entry.oauthUrl = result.oauthUrl;
+ entry.error = undefined;
+ Logger.log(
+ 'MCP',
+ `Server '${result.name}' requires OAuth authentication`
+ );
} else {
entry.status = 'disconnected';
entry.error = result.error ?? 'Unknown error';
}
}
+
+ initialized = true;
}
/**
@@ -129,3 +150,197 @@ export function getMcpPromptInfo(
};
});
}
+
+/**
+ * Start the OAuth flow for a server that requires authentication.
+ *
+ * This method:
+ * 1. Starts a local callback server on a random port
+ * 2. Creates a new connection with an OAuth provider
+ * 3. Triggers the SDK's built-in OAuth discovery + PKCE flow
+ * 4. Returns the authorization URL for the frontend to open in a browser
+ * 5. In the background: waits for callback → finishAuth → reconnect → update status
+ *
+ * The frontend should:
+ * - Call shell.openExternal(authorizationUrl) to open the browser
+ * - Poll getOAuthStatus() until status becomes 'connected'
+ *
+ * @param name - MCP server name
+ * @returns The authorization URL to open in the browser
+ */
+export async function startOAuthFlow(name: string): Promise<{
+ authorizationUrl: string;
+}> {
+ const entry = serverEntries.get(name);
+ if (!entry) {
+ throw new Error(`MCP server '${name}' not found`);
+ }
+ if (entry.status !== 'needs_auth' && entry.status !== 'disconnected') {
+ throw new Error(
+ `Server '${name}' is '${entry.status}', cannot start OAuth`
+ );
+ }
+ if (pendingOAuth.has(name)) {
+ throw new Error(`OAuth flow already in progress for '${name}'`);
+ }
+
+ pendingOAuth.set(name, { status: 'starting' });
+ entry.status = 'connecting';
+ entry.error = undefined;
+
+ Logger.log('MCP-OAuth', `Starting OAuth flow for '${name}'`);
+
+ const callback = await startCallbackServer();
+
+ Logger.log('MCP-OAuth', `Callback server listening on port ${callback.port}`);
+
+ const provider = new McpOAuthProvider(name, getOAuthTokensPath());
+ provider.setRedirectUrl(`http://localhost:${callback.port}/callback`);
+
+ const serverConn = new MCPServerConnection({
+ name,
+ connectionType: 'streamable_http',
+ url: entry.config.url,
+ headers: entry.config.headers,
+ connectTimeoutSec: entry.config.connect_timeout,
+ executeTimeoutSec: entry.config.execute_timeout,
+ authProvider: provider,
+ });
+ serverConnections.set(name, serverConn);
+
+ try {
+ const result = await serverConn.connect();
+
+ if (!result.needsAuth) {
+ callback.close();
+ pendingOAuth.delete(name);
+
+ const tools = buildToolMetaList(name, serverConn);
+ const connection: McpConnection = {
+ name,
+ tools: serverConn.tools,
+ disconnect: () => serverConn.disconnect(),
+ };
+ connections.set(name, connection);
+ entry.status = 'connected';
+ entry.tools = tools;
+ return { authorizationUrl: '' };
+ }
+
+ const authorizationUrl = serverConn.authorizationUrl;
+ if (!authorizationUrl) {
+ throw new Error('OAuth flow started but no authorization URL was saved');
+ }
+
+ pendingOAuth.set(name, { status: 'authorizing' });
+ entry.oauthUrl = authorizationUrl;
+
+ handleOAuthCallback(name, serverConn, callback, entry);
+
+ return { authorizationUrl };
+ } catch (error: unknown) {
+ const message = error instanceof Error ? error.message : String(error);
+ callback.close();
+ pendingOAuth.delete(name);
+ entry.status = 'disconnected';
+ entry.error = message;
+ throw error;
+ }
+}
+
+/**
+ * Background handler: wait for browser callback → finishAuth → reconnect.
+ * All errors update the entry status instead of throwing.
+ */
+async function handleOAuthCallback(
+ name: string,
+ serverConn: MCPServerConnection,
+ callback: { waitForCode: () => Promise; close: () => void },
+ entry: McpServerEntry
+): Promise {
+ try {
+ const code = await Promise.race([
+ callback.waitForCode(),
+ new Promise((_, reject) =>
+ setTimeout(
+ () => reject(new Error('OAuth callback timed out')),
+ OAUTH_TIMEOUT_MS
+ )
+ ),
+ ]);
+
+ pendingOAuth.set(name, { status: 'exchanging' });
+ await serverConn.finishAuth(code);
+ Logger.log('MCP', `OAuth token exchange completed for '${name}'`);
+
+ pendingOAuth.set(name, { status: 'connecting' });
+ serverConn.tools = [];
+ const connectResult = await serverConn.connect();
+
+ if (!connectResult.success) {
+ throw new Error('Reconnection failed after OAuth');
+ }
+
+ const tools = buildToolMetaList(name, serverConn);
+ const connection: McpConnection = {
+ name,
+ tools: serverConn.tools,
+ disconnect: () => serverConn.disconnect(),
+ };
+
+ connections.set(name, connection);
+ entry.status = 'connected';
+ entry.tools = tools;
+ entry.error = undefined;
+ entry.oauthUrl = undefined;
+
+ pendingOAuth.set(name, { status: 'done' });
+ Logger.log(
+ 'MCP',
+ `OAuth flow completed for '${name}' - ${tools.length} tools loaded`
+ );
+ } catch (error: unknown) {
+ const message = error instanceof Error ? error.message : String(error);
+ Logger.log('ERROR', `OAuth flow failed for '${name}': ${message}`);
+ entry.status = 'needs_auth';
+ entry.error = `OAuth failed: ${message}`;
+ pendingOAuth.set(name, { status: 'failed', error: message });
+ } finally {
+ callback.close();
+ setTimeout(() => pendingOAuth.delete(name), 5000);
+ }
+}
+
+function buildToolMetaList(
+ name: string,
+ serverConn: MCPServerConnection
+): McpToolMeta[] {
+ return serverConn.tools.map((tool) => ({
+ id: `mcp:${name}:${tool.name}`,
+ name: tool.name,
+ description: tool.description,
+ }));
+}
+
+/**
+ * Get the current OAuth status for a server.
+ * Used by the frontend to poll during the authorization flow.
+ *
+ * @returns status and optional oauthUrl / error
+ */
+export function getOAuthStatus(name: string): {
+ status: McpServerEntry['status'];
+ oauthUrl?: string;
+ error?: string;
+} {
+ const entry = serverEntries.get(name);
+ if (!entry) {
+ throw new Error(`MCP server '${name}' not found`);
+ }
+
+ return {
+ status: entry.status,
+ oauthUrl: entry.oauthUrl,
+ error: entry.error,
+ };
+}
diff --git a/packages/server/src/mcp/types.ts b/packages/server/src/mcp/types.ts
index cd40f84..51de33c 100644
--- a/packages/server/src/mcp/types.ts
+++ b/packages/server/src/mcp/types.ts
@@ -5,9 +5,13 @@
import type { JsonSchema } from '../tools/base.js';
import type { Tool } from '../tools/base.js';
-export type ConnectionType = 'stdio' | 'sse' | 'streamable_http';
+export type ConnectionType = 'stdio' | 'streamable_http';
-export type McpServerStatus = 'disconnected' | 'connecting' | 'connected';
+export type McpServerStatus =
+ | 'disconnected'
+ | 'connecting'
+ | 'connected'
+ | 'needs_auth';
export interface McpCallToolResult {
content?: unknown;
@@ -61,7 +65,6 @@ export interface McpServerConfig {
disabled?: boolean;
connect_timeout?: number;
execute_timeout?: number;
- sse_read_timeout?: number;
}
export interface McpConfigFile {
@@ -80,6 +83,7 @@ export interface McpServerEntry {
status: McpServerStatus;
tools: McpToolMeta[];
error?: string;
+ oauthUrl?: string;
}
export interface McpConnection {
diff --git a/packages/server/src/server/routers/mcp.ts b/packages/server/src/server/routers/mcp.ts
index 2299f33..4f821cd 100644
--- a/packages/server/src/server/routers/mcp.ts
+++ b/packages/server/src/server/routers/mcp.ts
@@ -2,13 +2,20 @@
* @fileoverview HTTP routes for MCP management.
*
* Routes:
- * - GET /api/mcp - List all MCP servers with status and tools
- * - GET /api/mcp/:name - Get a single MCP server's status and tools
+ * - GET /api/mcp - List all MCP servers with status and tools
+ * - GET /api/mcp/:name - Get a single MCP server's status and tools
+ * - POST /api/mcp/:name/oauth/authorize - Start OAuth flow, returns authorization URL
+ * - GET /api/mcp/:name/oauth/status - Poll OAuth flow status
*/
import { Router } from 'express';
import type { Request, Response } from 'express';
-import { listMcpServers, getMcpServer } from '../../mcp/index.js';
+import {
+ listMcpServers,
+ getMcpServer,
+ startOAuthFlow,
+ getOAuthStatus,
+} from '../../mcp/index.js';
import { Logger } from '../../util/logger.js';
import { getParam } from './utils.js';
@@ -50,5 +57,60 @@ export function createMcpRouter(): Router {
}
});
+ router.post('/:name/oauth/authorize', async (req: Request, res: Response) => {
+ try {
+ const name = getParam(req.params['name']);
+ if (!name) {
+ res.status(400).json({ error: 'Server name is required' });
+ return;
+ }
+
+ const result = await startOAuthFlow(name);
+ res.json(result);
+ } catch (error) {
+ Logger.log('MCP', 'Error starting OAuth flow', error);
+
+ const message = error instanceof Error ? error.message : 'Unknown error';
+
+ if (message.includes('not found')) {
+ res.status(404).json({ error: message });
+ return;
+ }
+ if (
+ message.includes('cannot start OAuth') ||
+ message.includes('already in progress')
+ ) {
+ res.status(400).json({ error: message });
+ return;
+ }
+
+ res.status(500).json({ error: message });
+ }
+ });
+
+ router.get('/:name/oauth/status', (req: Request, res: Response) => {
+ try {
+ const name = getParam(req.params['name']);
+ if (!name) {
+ res.status(400).json({ error: 'Server name is required' });
+ return;
+ }
+
+ const status = getOAuthStatus(name);
+ res.json(status);
+ } catch (error) {
+ Logger.log('MCP', 'Error getting OAuth status', error);
+
+ const message = error instanceof Error ? error.message : 'Unknown error';
+
+ if (message.includes('not found')) {
+ res.status(404).json({ error: message });
+ return;
+ }
+
+ res.status(500).json({ error: message });
+ }
+ });
+
return router;
}
diff --git a/packages/server/src/util/app.ts b/packages/server/src/util/app.ts
new file mode 100644
index 0000000..cedea0c
--- /dev/null
+++ b/packages/server/src/util/app.ts
@@ -0,0 +1,9 @@
+import pkg from '../../package.json' with { type: 'json' };
+
+declare global {
+ var SERVER_VERSION: string | undefined;
+}
+
+export const APP_NAME: string = pkg.name;
+
+export const APP_VERSION: string = globalThis.SERVER_VERSION ?? pkg.version;
diff --git a/packages/server/src/util/paths.ts b/packages/server/src/util/paths.ts
index 1d84054..ac2f394 100644
--- a/packages/server/src/util/paths.ts
+++ b/packages/server/src/util/paths.ts
@@ -51,6 +51,8 @@ export const getLogsDir = () => path.join(APP_DIR, 'logs');
export const getConfigPath = () => path.join(getConfigDir(), 'config.yaml');
export const getAuthPath = () => path.join(getConfigDir(), 'auth.json');
export const getMcpConfigPath = () => path.join(getMcpDir(), 'mcp.json');
+export const getOAuthTokensPath = () =>
+ path.join(getMcpDir(), 'oauth-tokens.json');
/**
* Returns the path to the cloudflared binary.
diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json
index fdf421f..3dbf3b9 100644
--- a/packages/server/tsconfig.json
+++ b/packages/server/tsconfig.json
@@ -29,6 +29,6 @@
"jsx": "react-jsx",
"types": ["bun-types"]
},
- "include": ["src/**/*"],
+ "include": ["src/**/*", "package.json"],
"exclude": ["node_modules", "dist", "tests"]
}
From 6871cd2fe0bff175a0873b67bd455bd4a86dd405 Mon Sep 17 00:00:00 2001
From: "Yufeng(Jonathan) Zhang"
<56613491+Code-MonkeyZhang@users.noreply.github.com>
Date: Sat, 2 May 2026 15:13:49 +0800
Subject: [PATCH 2/2] UI improve (#4)
* update logo
* fix setting UI & agent editor UI
* remove time
* update server UI
* update readme
* update readme
---
README.md | 24 +-
assets/logo-rounded.png | Bin 0 -> 167230 bytes
assets/screenshot-agent-settings.jpg | Bin 0 -> 96631 bytes
assets/screenshot-companion.jpg | Bin 0 -> 125252 bytes
assets/screenshot-main.jpg | Bin 0 -> 64449 bytes
assets/screenshot-model-config.jpg | Bin 0 -> 99063 bytes
packages/desktop/README.md | 129 ++++--
packages/desktop/build/icon-mac.png | Bin 129270 -> 106331 bytes
packages/desktop/build/icon-win.png | Bin 234073 -> 211580 bytes
packages/desktop/package.json | 1 +
packages/desktop/src/renderer/App.tsx | 43 +-
.../src/renderer/components/AgentEditor.tsx | 391 ++++++++----------
.../src/renderer/components/AgentSidebar.tsx | 18 +-
.../src/renderer/components/ConfigForm.tsx | 71 +++-
.../src/renderer/components/InfoRow.tsx | 49 +++
.../src/renderer/components/McpListTab.tsx | 139 ++++---
.../components/ProviderConfigPanel.tsx | 219 +++++-----
.../components/ServerManagerModal.tsx | 148 ++++---
.../src/renderer/components/SessionItem.tsx | 21 -
.../src/renderer/components/SettingRow.tsx | 37 ++
.../src/renderer/components/SettingsPage.tsx | 92 ++---
.../src/renderer/components/SkillListTab.tsx | 75 ++--
.../renderer/components/VoiceConfigPanel.tsx | 127 +++---
.../src/renderer/components/ui/Switch.tsx | 31 ++
packages/desktop/src/renderer/index.css | 1 +
.../desktop/src/renderer/stores/viewStore.ts | 11 +-
26 files changed, 880 insertions(+), 747 deletions(-)
create mode 100644 assets/logo-rounded.png
create mode 100644 assets/screenshot-agent-settings.jpg
create mode 100644 assets/screenshot-companion.jpg
create mode 100644 assets/screenshot-main.jpg
create mode 100644 assets/screenshot-model-config.jpg
create mode 100644 packages/desktop/src/renderer/components/InfoRow.tsx
create mode 100644 packages/desktop/src/renderer/components/SettingRow.tsx
create mode 100644 packages/desktop/src/renderer/components/ui/Switch.tsx
diff --git a/README.md b/README.md
index dd6e3ec..0439ae6 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
7Agn?a^cZKWgQ6QGzR=TcLw;f
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 pJ3*tVjL`CLrHAU!THkTCFzVbDTTVk^u
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
设置中心
diff --git a/packages/desktop/src/renderer/components/VoiceConfigPanel.tsx b/packages/desktop/src/renderer/components/VoiceConfigPanel.tsx index dc99665..a747660 100644 --- a/packages/desktop/src/renderer/components/VoiceConfigPanel.tsx +++ b/packages/desktop/src/renderer/components/VoiceConfigPanel.tsx @@ -21,13 +21,8 @@ interface Feedback { * 保存前会先调用 TTS 接口验证 Key 的有效性，验证通过才保存 */ export const VoiceConfigPanel: React.FC = () => { - const { - voiceApiKey, - setVoiceApiKey, - loadVoiceApiKey, - summaryThreshold, - setSummaryThreshold, - } = useVoiceStore(); + const { voiceApiKey, setVoiceApiKey, summaryThreshold, setSummaryThreshold } = + useVoiceStore(); const [inputKey, setInputKey] = useState(''); const [showKey, setShowKey] = useState(false); const [verifying, setVerifying] = useState(false); @@ -36,10 +31,6 @@ export const VoiceConfigPanel: React.FC = () => { String(summaryThreshold) ); - useEffect(() => { - loadVoiceApiKey(); - }, [loadVoiceApiKey]); - useEffect(() => { if (voiceApiKey) { setInputKey(voiceApiKey); diff --git a/packages/desktop/src/renderer/lib/api.ts b/packages/desktop/src/renderer/lib/api.ts index b905a25..5d8c08a 100644 --- a/packages/desktop/src/renderer/lib/api.ts +++ b/packages/desktop/src/renderer/lib/api.ts @@ -47,11 +47,17 @@ export async function getBaseUrl(): PromiseAuthorization successful
You can close this tab and return to the app.
+`; + +export interface CallbackResult { + port: number; + waitForCode: () => Promise
+
+
# Persona Agent
**你的本地 AI Agent 工作站**
@@ -7,22 +9,30 @@
创建和管理多个 AI Agent，赋予它们工具、技能和性格，让它们帮你完成任务。
[](LICENSE)
+
+[](https://github.com/Code-MonkeyZhang/persona-agent/releases)
-
+## 截图
-## 它能做什么
+
-Persona Agent 让你在本地创建多个 AI Agent，每个有独立的角色设定、模型配置和会话历史。你可以用一个 Agent 做编程助手，另一个做写作顾问，互不干扰。Agent 可以调用内置工具来执行命令、读写文件，也可以通过 MCP 协议连接外部工具服务器扩展能力，还可以加载 Skill 来获得专业知识。
+
-对话支持流式输出和完整的 Markdown 渲染，代码块一键复制，Agent 的推理过程和工具调用细节都可以展开查看。如果你想换一种氛围，可以打开伴侣模式：全屏展示角色立绘，Agent 会根据对话自动切换表情，配合语音合成朗读回复。
+
-内置 Cloudflare Tunnel，一键把本地服务暴露到公网，从手机或其它设备远程访问你的 Agent。
+
-**支持的模型供应商：** OpenAI、Anthropic、Google、DeepSeek、MiniMax、xAI、Groq、Mistral、OpenRouter、Cerebras、Fireworks 等 17+ 家。每个 Agent 独立配置默认模型，每个会话可以临时切换。
+## 核心功能
-**跨平台：** macOS（Apple Silicon / Intel）、Windows x64。下载安装包即可使用，无需安装任何运行时。
+- **多 Agent 管理** — 创建多个独立 Agent，每个有自己的角色设定、模型配置和会话历史，互不干扰
+- **17+ 模型供应商** — OpenAI、Anthropic、Google、DeepSeek、MiniMax、xAI、Groq、Mistral、OpenRouter、Cerebras、Fireworks 等，每个 Agent 独立配置默认模型，每个会话可以临时切换
+- **工具调用** — 内置工具（执行命令、读写文件），MCP 协议连接外部工具服务器，Skill 加载获得专业知识
+- **流式对话** — 完整 Markdown 渲染，代码块一键复制，推理过程和工具调用细节可展开查看
+- **Agent 形象** — 全屏展示角色立绘，Agent 根据对话自动切换表情，配合语音合成朗读回复
+- **远程访问** — 内置 Cloudflare Tunnel，一键把本地服务暴露到公网，从手机或其它设备远程访问
+- **跨平台** — macOS（Apple Silicon / Intel）、Windows x64，下载即用，无需安装运行时
## 下载安装
diff --git a/assets/logo-rounded.png b/assets/logo-rounded.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e6d7cb547c585983af4a41b745d613e3c2c75ce
GIT binary patch
literal 167230
zcmYg12{@G9_tT<65kirzKKmAtl0BvD8Dj=x$(oRTUlSEVWhX?87{
+
# Persona Agent
**你的本地 AI Agent 工作站**
@@ -7,22 +9,30 @@
创建和管理多个 AI Agent，赋予它们工具、技能和性格，让它们帮你完成任务。
[](LICENSE)
+
+[](https://github.com/Code-MonkeyZhang/persona-agent/releases)