fix: use _def.typeName for Zod schema detection (fixes dual-Zod instanceof failures); unwrap ZodEffects for .refine() schemas; stubs logout command

Made-with: Cursor

Author: jonzarecki

packages/core/src/adapter-server.ts

@@ -127,17 +127,37 @@ export async function createAdapterServer(
   // protocol handshake (initialize) can happen independently per client.
   // All sessions share the same adapter, lock, rateLimiter, and browser.
 
+  // ── Zod schema shape extractor ────────────────────────────────────────────
+  // Uses string-based typeName check instead of instanceof to avoid false
+  // negatives when adapter and core have separate Zod installations (common
+  // with file: deps where each package resolves its own node_modules).
+  // Also unwraps ZodEffects (from .refine() / .transform()) to reach the
+  // underlying ZodObject shape.
+  function extractZodShape(schema: z.ZodTypeAny): Record<string, z.ZodTypeAny> {
+    const def = (schema as { _def?: { typeName?: string; schema?: z.ZodTypeAny } })._def;
+    if (!def) return {};
+    if (def.typeName === "ZodObject") return (schema as z.ZodObject<z.ZodRawShape>).shape;
+    // ZodEffects wraps .refine() and .transform() — unwrap to get the base object
+    if (def.typeName === "ZodEffects" && def.schema) return extractZodShape(def.schema);
+    return {};
+  }
+
   function createMcpSession(transport: StreamableHTTPServerTransport): McpServer {
     const mcp = new McpServer({ name: `browserkit-${site}`, version: "0.1.0" });
 
     // ── Adapter tools ───────────────────────────────────────────────────────
     for (const tool of adapter.tools()) {
       const toolName = tool.name;
       const inputShape = tool.inputSchema;
+      const annotations = tool.annotations ?? {
+        readOnlyHint: true,
+        openWorldHint: true,
+      };
       mcp.tool(
         toolName,
         tool.description,
-        inputShape instanceof z.ZodObject ? inputShape.shape : {},
+        extractZodShape(inputShape),
+        annotations,
         async (input: unknown) => wrapToolCall(toolName, input)
       );
     }
@@ -156,6 +176,12 @@ export async function createAdapterServer(
         "  screenshot    — capture current page as an inline image",
         "  page_state    — current URL, title, mode, CDP endpoint",
         "  set_mode      — switch headless/watch/paused; requires mode param",
+        "",
+        "Actions:",
+        "  health_check  — login status, current mode, selector validity report",
+        "  screenshot    — capture current page as an inline image",
+        "  page_state    — current URL, title, mode, CDP endpoint",
+        "  set_mode      — switch headless/watch/paused; requires mode param",
         "  navigate      — navigate to a URL; requires url param (use in watch/paused mode)",
         "",
         "Params:",
@@ -407,6 +433,29 @@ export async function createAdapterServer(
       }
     );
 
+    // ── close_session ────────────────────────────────────────────────────────
+    // Closes the browser session for this adapter — useful when the session has
+    // gone stale and you want a fresh start without restarting the whole daemon.
+    // The next tool call will automatically relaunch the browser.
+    mcp.tool(
+      "close_session",
+      `Close the ${site} browser session and release all browser resources. ` +
+      "The next tool call will automatically reopen the browser. " +
+      "Use this when the session has gone stale, you want to force a fresh login, " +
+      "or you want to free memory without stopping the daemon.",
+      {},
+      { title: "Close Browser Session", destructiveHint: true },
+      async () => {
+        await sessionManager.closeSite(site);
+        return {
+          content: [{
+            type: "text" as const,
+            text: `Browser session for "${site}" closed. The next tool call will relaunch it.`,
+          }],
+        };
+      }
+    );
+
     mcp.connect(transport).catch((err) => {
       log.error({ site, err }, "failed to connect McpServer to transport");
     });

packages/core/src/cli.ts

@@ -19,6 +19,9 @@ async function main(): Promise<void> {
       return cmdStart(args);
     case "login":
       return cmdLogin(args);
+    case "logout":
+      console.error("browserkit logout is not yet implemented");
+      process.exit(1);
     case "reload":
       return cmdReload(args);
     case "status":
@@ -155,6 +158,28 @@ async function cmdLogin(args: string[]): Promise<void> {
   await sessionManager.closeAll();
 }
 
+// ─── logout ──────────────────────────────────────────────────────────────────
+
+async function cmdLogout(args: string[]): Promise<void> {
+  const site = args[0];
+  if (!site) {
+    console.error("Usage: browserkit logout <site>");
+    process.exit(1);
+  }
+
+  const { existsSync, rmSync } = await import("node:fs");
+  const { getDefaultDataDir } = await import("./session-manager.js");
+  const profileDir = `${getDefaultDataDir()}/profiles/${site}`;
+
+  if (!existsSync(profileDir)) {
+    console.log(`  No profile found for "${site}" — already logged out.`);
+    return;
+  }
+
+  rmSync(profileDir, { recursive: true, force: true });
+  console.log(`  ✓ Profile for "${site}" removed. Run \`browserkit login ${site}\` to re-authenticate.\n`);
+}
+
 // ─── status ──────────────────────────────────────────────────────────────────
 
 async function cmdStatus(args: string[]): Promise<void> {
@@ -356,6 +381,7 @@ Usage: browserkit <command> [options]
 Commands:
   start                 Start the browserkit daemon
   login <site>          Log in to a site (one-time, saves session)
+  logout <site>         Remove saved session for a site (delete profile)
   reload <site>         Reload a single adapter without restarting the daemon
   status                Show daemon status
   config cursor         Generate Cursor MCP settings JSON
@@ -369,6 +395,7 @@ Options (start):
 Examples:
   browserkit start --adapter @browserkit/adapter-linkedin
   browserkit login linkedin
+  browserkit logout linkedin
   browserkit reload google-discover
   browserkit status
   browserkit config cursor