Revert "TKT-68 klavis mcp integrated (#51)"

This reverts commit 54a1eec.

Author: shadowfax92

packages/agent/src/session/SessionManager.ts

@@ -28,7 +28,6 @@ enum SessionState {
  */
 const SessionSchema = z.object({
   id: z.string().uuid(),
-  userId: z.string().optional(), // Klavis user ID for MCP integration
   state: z.nativeEnum(SessionState),
   createdAt: z.number().positive(),
   lastActivity: z.number().positive(),
@@ -55,7 +54,6 @@ type SessionMetrics = z.infer<typeof SessionMetricsSchema>;
  */
 const CreateSessionOptionsSchema = z.object({
   id: z.string().uuid().optional(), // Optional: specify sessionId (useful for testing)
-  userId: z.string().optional(), // Optional: Klavis user ID for MCP integration
   agentType: z.string().min(1).optional(), // Optional: agent type (defaults to 'codex-sdk')
 });
 
@@ -124,7 +122,6 @@ export class SessionManager {
 
     const session: Session = {
       id: sessionId,
-      userId: options?.userId,
       state: SessionState.IDLE,
       createdAt: now,
       lastActivity: now,
@@ -198,16 +195,6 @@ export class SessionManager {
     return this.agents.get(sessionId);
   }
 
-  /**
-   * Get user ID for a session
-   *
-   * @param sessionId - Session ID
-   * @returns User ID or undefined if not set
-   */
-  getUserId(sessionId: string): string | undefined {
-    return this.sessions.get(sessionId)?.userId;
-  }
-
   /**
    * Update session activity timestamp
    */

packages/mcp/tsconfig.json

@@ -7,7 +7,7 @@
     "declaration": true,
     "declarationMap": true
   },
-  "include": ["src/**/*", "tests/**/*", "../tools/src/klavis"],
+  "include": ["src/**/*", "tests/**/*"],
   "exclude": ["node_modules", "dist/**/*"],
   "references": [{"path": "../common"}, {"path": "../tools"}]
 }

packages/server/src/main.ts

@@ -30,7 +30,6 @@ import {
   allControllerTools,
   type ToolDefinition,
 } from '@browseros/tools';
-import {allKlavisTools} from '@browseros/tools/klavis';
 
 import {parseArguments} from './args.js';
 
@@ -136,14 +135,13 @@ function mergeTools(
     allControllerTools,
     controllerContext,
   );
-  const klavisTools = process.env.KLAVIS_API_KEY ? allKlavisTools : [];
 
   logger.info(
-    `Total tools available: ${cdpTools.length + wrappedControllerTools.length + klavisTools.length} ` +
-      `(${cdpTools.length} CDP + ${wrappedControllerTools.length} extension + ${klavisTools.length} Klavis)`,
+    `Total tools available: ${cdpTools.length + wrappedControllerTools.length} ` +
+      `(${cdpTools.length} CDP + ${wrappedControllerTools.length} extension)`,
   );
 
-  return [...cdpTools, ...wrappedControllerTools, ...klavisTools];
+  return [...cdpTools, ...wrappedControllerTools];
 }
 
 function startMcpServer(config: {

packages/tools/package.json

@@ -8,7 +8,6 @@
     ".": "./src/index.ts",
     "./cdp-based": "./src/cdp-based/index.ts",
     "./controller-based": "./src/controller-based/index.ts",
-    "./klavis": "./src/klavis/index.ts",
     "./response": "./src/response/index.ts",
     "./formatters": "./src/formatters/index.ts",
     "./types": "./src/types/index.ts"

packages/tools/src/index.ts

@@ -13,10 +13,6 @@ export * as cdpTools from './cdp-based/index.js';
 export {allControllerTools} from './controller-based/index.js';
 export * as controllerTools from './controller-based/index.js';
 
-// Export Klavis MCP tools (Gmail, Google Calendar, Sheets, Docs, Notion, etc.)
-export {allKlavisTools} from './klavis/index.js';
-export * as klavisTools from './klavis/index.js';
-
 // Export types
 export * from './types/index.js';