diff --git a/.gitignore b/.gitignore
index fd4ddcd..b480849 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,28 @@ dist
 *.zip
 test_file.txt
 .DS_Store
+
+# Benchmark and evaluation artifacts
+.mcpbr_state/
+eval_results_*/
+monitoring_logs/
+*.log
+.monitor_pid
+.vm_ip
+*_output.log
+BENCHMARK_*.md
+MCP_TOOL_CALL_ANALYSIS.md
+BUG_FILED_SUMMARY.md
+SUPERMODEL_MCP_INVESTIGATION.md
+CURRENT_RUN_STATUS.md
+current_status_report.txt
+MORNING_BRIEFING.md
+OVERNIGHT_SUMMARY.md
+START_HERE.md
+.claude_notes
+mcpbr-*.yaml
+*-benchmark*.sh
+*-monitor*.sh
+*-comparison*.sh
+setup-*.sh
+reconnect.sh
diff --git a/package-lock.json b/package-lock.json
index 69560bb..a3779dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,16 @@
 {
   "name": "@supermodeltools/mcp-server",
-  "version": "0.4.5",
+  "version": "0.5.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@supermodeltools/mcp-server",
-      "version": "0.4.5",
+      "version": "0.5.4",
       "license": "UNLICENSED",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.0.1",
-        "@supermodeltools/sdk": "^0.3.8",
+        "@supermodeltools/sdk": "^0.6.0",
         "archiver": "^7.0.1",
         "ignore": "^7.0.5",
         "jq-web": "^0.6.2",
@@ -1121,9 +1121,10 @@
       }
     },
     "node_modules/@supermodeltools/sdk": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/@supermodeltools/sdk/-/sdk-0.3.8.tgz",
-      "integrity": "sha512-XzBvi9dRjI3tgd6TEmuqSLjCFQZ7ISRdjXl5Ba1KjlbOKv7pC5dZ+1pVwFvohzD/P6IFOXCBlabq8on7DgY7BA=="
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@supermodeltools/sdk/-/sdk-0.6.0.tgz",
+      "integrity": "sha512-W/5zPrkP+NaPSZ31xiX5gLbde5/HvM/guS0ZIGAfbnHGUvY5pGgFpsQOYitdU+N2oPcuZZSUW++cx+Sdao9kyg==",
+      "license": "UNLICENSED"
     },
     "node_modules/@tybys/wasm-util": {
       "version": "0.10.1",
diff --git a/package.json b/package.json
index dc8d603..32fe584 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.1",
-    "@supermodeltools/sdk": "^0.3.8",
+    "@supermodeltools/sdk": "^0.6.0",
     "archiver": "^7.0.1",
     "ignore": "^7.0.5",
     "jq-web": "^0.6.2",
diff --git a/src/server.ts b/src/server.ts
index 444864d..cd48c11 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -1,6 +1,6 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { Configuration, DefaultApi } from '@supermodeltools/sdk';
+import { Configuration, DefaultApi, SupermodelClient } from '@supermodeltools/sdk';
 import createSupermodelGraphTool from './tools/create-supermodel-graph';
 import { ClientContext } from './types';
 import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
@@ -96,8 +96,9 @@ Example:
       logger.debug('Default workdir:', this.defaultWorkdir);
     }
 
+    const api = new DefaultApi(config);
     this.client = {
-      graphs: new DefaultApi(config),
+      graphs: new SupermodelClient(api),
     };
 
     this.setupHandlers();
diff --git a/src/tools/create-supermodel-graph.ts b/src/tools/create-supermodel-graph.ts
index 1ec01cc..53db3c3 100644
--- a/src/tools/create-supermodel-graph.ts
+++ b/src/tools/create-supermodel-graph.ts
@@ -754,11 +754,6 @@ async function fetchFromApi(client: ClientContext, file: string, idempotencyKey:
   // Log the request details
   logRequest(apiUrl, 'POST', fileSize, idempotencyKey);
 
-  const requestParams = {
-    file: fileBlob as any,
-    idempotencyKey: idempotencyKey,
-  };
-
   // Start progress logging
   console.error('[Supermodel] Starting codebase analysis...');
 
@@ -772,7 +767,11 @@ async function fetchFromApi(client: ClientContext, file: string, idempotencyKey:
   }, 15000);
 
   try {
-    const response = await client.graphs.generateSupermodelGraph(requestParams);
+    // SupermodelClient handles polling automatically
+    const response = await client.graphs.generateSupermodelGraph(
+      fileBlob as any,
+      { idempotencyKey }
+    );
     const duration = Date.now() - startTime;
 
     // Clear progress interval
diff --git a/src/types.ts b/src/types.ts
index 874fa56..fba25c3 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -1,8 +1,8 @@
-import { DefaultApi } from '@supermodeltools/sdk';
+import { SupermodelClient } from '@supermodeltools/sdk';
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 
 export interface ClientContext {
-  graphs: DefaultApi;
+  graphs: SupermodelClient;
 }
 
 export type ContentBlock =