Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 39 additions & 1 deletion mcp/src/cloudbase-manager.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import CloudBase from "@cloudbase/manager-node";
import { getLoginState } from './auth.js';
import { autoSetupEnvironmentId } from './tools/interactive.js';
import { CloudBaseOptions } from './types.js';
import { CloudBaseOptions, Logger } from './types.js';
import { debug, error } from './utils/logger.js';
const ENV_ID_TIMEOUT = 600000; // 10 minutes (600 seconds) - matches InteractiveServer timeout

Expand Down Expand Up @@ -192,5 +192,43 @@ export function createCloudBaseManagerWithOptions(cloudBaseOptions: CloudBaseOpt
return manager;
}

/**
* Extract RequestId from result object
*/
export function extractRequestId(result: any): string | undefined {
if (!result || typeof result !== 'object') {
return undefined;
}

// Try common RequestId field names
if ('RequestId' in result && result.RequestId) {
return String(result.RequestId);
}
if ('requestId' in result && result.requestId) {
return String(result.requestId);
}
if ('request_id' in result && result.request_id) {
return String(result.request_id);
}

return undefined;
}

/**
* Log CloudBase manager call result with RequestId
*/
export function logCloudBaseResult(logger: Logger | undefined, result: any): void {
if (!logger) {
return;
}

const requestId = extractRequestId(result);
logger({
type: 'capiResult',
requestId,
result,
});
}

// 导出环境管理器实例供其他地方使用
export { envManager };
10 changes: 9 additions & 1 deletion mcp/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { registerDataModelTools } from "./tools/dataModel.js";
import { registerGatewayTools } from "./tools/gateway.js";
import { registerInviteCodeTools } from "./tools/invite-code.js";
import { registerSecurityRuleTools } from "./tools/security-rule.js";
import { CloudBaseOptions } from "./types.js";
import { CloudBaseOptions, Logger } from "./types.js";
import { enableCloudMode } from "./utils/cloud-mode.js";
import { info } from './utils/logger.js';
import { wrapServerWithTelemetry } from "./utils/tool-wrapper.js";
Expand Down Expand Up @@ -101,6 +101,7 @@ function parseEnabledPlugins(): string[] {
export interface ExtendedMcpServer extends McpServer {
cloudBaseOptions?: CloudBaseOptions;
ide?: string;
logger?: Logger;
}

/**
Expand Down Expand Up @@ -130,6 +131,7 @@ export async function createCloudBaseMcpServer(options?: {
cloudBaseOptions?: CloudBaseOptions;
cloudMode?: boolean;
ide?: string;
logger?: Logger;
}): Promise<ExtendedMcpServer> {
const {
name = "cloudbase-mcp",
Expand All @@ -138,6 +140,7 @@ export async function createCloudBaseMcpServer(options?: {
cloudBaseOptions,
cloudMode = false,
ide,
logger,
} = options ?? {};

// Enable cloud mode if specified
Expand Down Expand Up @@ -177,6 +180,11 @@ export async function createCloudBaseMcpServer(options?: {
server.ide = ide;
}

// Store logger in server instance for tools to access
if (logger) {
server.logger = logger;
}

// Enable telemetry if requested
if (enableTelemetry) {
wrapServerWithTelemetry(server);
Expand Down
Loading
Loading