diff --git a/packages/adk/tests/transport-import.test.ts b/packages/adk/tests/transport-import.test.ts
index 327f98b0..ed84cdfa 100644
--- a/packages/adk/tests/transport-import.test.ts
+++ b/packages/adk/tests/transport-import.test.ts
@@ -10,11 +10,13 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 
 // Mock the ADT client
+// Response must have 'root' wrapper to match TransportmanagmentSingleSchema
 const mockTransportResponse = {
-  object_type: 'K',
-  name: 'DEVK900001',
-  type: 'RQRQ',
-  request: {
+  root: {
+    object_type: 'K',
+    name: 'DEVK900001',
+    type: 'RQRQ',
+    request: {
     number: 'DEVK900001',
     parent: '',
     owner: 'DEVELOPER',
@@ -73,6 +75,7 @@ const mockTransportResponse = {
       },
     ],
   },
+  },  // close root
 };
 
 // Create mock client
@@ -240,24 +243,26 @@ describe('AdkTransport', () => {
     it('should deduplicate objects across tasks', async () => {
       // Create mock with duplicate object
       const mockWithDuplicates = {
-        ...mockTransportResponse,
-        request: {
-          ...mockTransportResponse.request,
-          task: [
-            {
-              number: 'DEVK900002',
-              abap_object: [
-                { pgmid: 'R3TR', type: 'CLAS', name: 'ZCL_SHARED' },
-              ],
-            },
-            {
-              number: 'DEVK900003',
-              abap_object: [
-                { pgmid: 'R3TR', type: 'CLAS', name: 'ZCL_SHARED' }, // Duplicate
-                { pgmid: 'R3TR', type: 'PROG', name: 'ZTEST' },
-              ],
-            },
-          ],
+        root: {
+          ...mockTransportResponse.root,
+          request: {
+            ...mockTransportResponse.root.request,
+            task: [
+              {
+                number: 'DEVK900002',
+                abap_object: [
+                  { pgmid: 'R3TR', type: 'CLAS', name: 'ZCL_SHARED' },
+                ],
+              },
+              {
+                number: 'DEVK900003',
+                abap_object: [
+                  { pgmid: 'R3TR', type: 'CLAS', name: 'ZCL_SHARED' }, // Duplicate
+                  { pgmid: 'R3TR', type: 'PROG', name: 'ZTEST' },
+                ],
+              },
+            ],
+          },
         },
       };
       
diff --git a/packages/adt-cli/src/lib/cli.test.ts b/packages/adt-cli/src/lib/cli.test.ts
index 57fd54d6..a0a09dc9 100644
--- a/packages/adt-cli/src/lib/cli.test.ts
+++ b/packages/adt-cli/src/lib/cli.test.ts
@@ -2,8 +2,8 @@ import { describe, it, expect } from 'vitest';
 import { createCLI } from './cli';
 
 describe('ADT CLI', () => {
-  it('should create CLI program', () => {
-    const program = createCLI();
+  it('should create CLI program', async () => {
+    const program = await createCLI();
     expect(program).toBeDefined();
     expect(program.name()).toBe('adt');
   });
diff --git a/packages/adt-cli/src/lib/commands/cts/tr/create.ts b/packages/adt-cli/src/lib/commands/cts/tr/create.ts
index 0f3d46eb..002cbfcd 100644
--- a/packages/adt-cli/src/lib/commands/cts/tr/create.ts
+++ b/packages/adt-cli/src/lib/commands/cts/tr/create.ts
@@ -165,15 +165,14 @@ export const ctsCreateCommand = new Command('create')
       }
 
       // Create the transport via ADK layer
-      // ADK expects { services: { transports } } - client already has client.services
-      const adkCtx = { services: client.services };
-      const tr = await AdkTransportRequest.create(adkCtx, {
+      // ADK expects (options, ctx?) - ctx is AdkContext with client property
+      const tr = await AdkTransportRequest.create({
         description: createOptions.description,
         type: createOptions.type as 'K' | 'W',
         target: createOptions.target,
         project: createOptions.project,
         owner: createOptions.owner,
-      });
+      }, { client });
 
       if (options.json) {
         console.log(JSON.stringify({
diff --git a/packages/adt-cli/src/lib/commands/cts/tr/release.ts b/packages/adt-cli/src/lib/commands/cts/tr/release.ts
index 523788f7..5b8b4496 100644
--- a/packages/adt-cli/src/lib/commands/cts/tr/release.ts
+++ b/packages/adt-cli/src/lib/commands/cts/tr/release.ts
@@ -38,12 +38,11 @@ export const ctsReleaseCommand = new Command('release')
 
       // Step 1: Get transport via ADK
       progress.step(`🔍 Getting transport ${transport}...`);
-      // ADK expects { services: { transports } } - client already has client.services
-      const adkCtx = { services: client.services };
+      // ADK expects (number, ctx?) - ctx is AdkContext with client property
       
       let tr: AdkTransportRequest;
       try {
-        tr = await AdkTransportRequest.get(adkCtx, transport);
+        tr = await AdkTransportRequest.get(transport, { client });
       } catch (err) {
         console.error(`❌ Transport ${transport} not found or not accessible`);
         process.exit(1);
diff --git a/packages/adt-cli/src/lib/commands/cts/tr/set.ts b/packages/adt-cli/src/lib/commands/cts/tr/set.ts
index 27184523..b21e8e04 100644
--- a/packages/adt-cli/src/lib/commands/cts/tr/set.ts
+++ b/packages/adt-cli/src/lib/commands/cts/tr/set.ts
@@ -69,9 +69,8 @@ export const ctsSetCommand = new Command('set')
 
       // Get transport via ADK
       progress.step(`🔍 Getting transport ${transport}...`);
-      // ADK expects { services: { transports } } - client already has client.services
-      const adkCtx = { services: client.services };
-      const tr = await AdkTransportRequest.get(adkCtx, transport);
+      // ADK expects (number, ctx?) - ctx is AdkContext with client property
+      const tr = await AdkTransportRequest.get(transport, { client });
       progress.done();
 
       // Update using ADK (handles lock/unlock automatically)
diff --git a/packages/adt-cli/src/lib/commands/cts/tree/config-set.ts b/packages/adt-cli/src/lib/commands/cts/tree/config-set.ts
index e17fab18..8eb724e3 100644
--- a/packages/adt-cli/src/lib/commands/cts/tree/config-set.ts
+++ b/packages/adt-cli/src/lib/commands/cts/tree/config-set.ts
@@ -108,7 +108,9 @@ export const treeConfigSetCommand = new Command('set')
       // Get configurations list
       const configsResponse = await client.adt.cts.transportrequests.searchconfiguration.configurations.get();
       
-      const configs = configsResponse?.configuration;
+      // Response has 'configurations' property (plural) containing config array
+      const configsData = configsResponse as { configurations?: unknown };
+      const configs = configsData?.configurations as Array<{ link?: { href?: string } }> | undefined;
       if (!configs) {
         console.log('\n❌ No search configuration found');
         return;
@@ -179,9 +181,10 @@ export const treeConfigSetCommand = new Command('set')
       console.log('\n🔄 Saving configuration...');
       const configData = buildConfigurationData(newProps);
       
+      // Cast to unknown to bypass schema mismatch - TODO: align schema with actual API
       await client.adt.cts.transportrequests.searchconfiguration.configurations.put(
         configId,
-        configData
+        configData as unknown as Parameters<typeof client.adt.cts.transportrequests.searchconfiguration.configurations.put>[1]
       );
 
       console.log('✅ Configuration updated successfully');
diff --git a/packages/adt-cli/src/lib/commands/cts/tree/config.ts b/packages/adt-cli/src/lib/commands/cts/tree/config.ts
index dfb9a320..ea4353ab 100644
--- a/packages/adt-cli/src/lib/commands/cts/tree/config.ts
+++ b/packages/adt-cli/src/lib/commands/cts/tree/config.ts
@@ -198,7 +198,9 @@ export const treeConfigCommand = new Command('config')
       // Get configurations list (typed)
       const configsResponse = await client.adt.cts.transportrequests.searchconfiguration.configurations.get();
       
-      const configs = configsResponse?.configuration;
+      // Response has 'configurations' property (plural) containing config array
+      const configsData = configsResponse as { configurations?: unknown };
+      const configs = configsData?.configurations as Array<{ link?: { href?: string } }> | undefined;
       if (!configs) {
         console.log('\n📭 No search configuration found');
         return;
@@ -220,10 +222,23 @@ export const treeConfigCommand = new Command('config')
 
       // Extract config ID and fetch details using typed contract
       const configId = extractConfigId(configUri);
-      const configDetails = await client.adt.cts.transportrequests.searchconfiguration.configurations.getById(configId);
+      const configDetailsRaw = await client.adt.cts.transportrequests.searchconfiguration.configurations.getById(configId);
+      
+      // Response has nested structure - extract configuration object
+      // Cast to expected shape for property access
+      type ConfigDetails = {
+        configuration?: {
+          properties?: { property?: Array<{ key?: string; _text?: string; isMandatory?: boolean }> };
+          createdBy?: string;
+          createdAt?: string;
+          changedBy?: string;
+          changedAt?: string;
+        };
+      };
+      const configDetails = (configDetailsRaw as ConfigDetails)?.configuration;
 
       // Convert properties to map for easy access
-      const properties = propertiesToMap(configDetails);
+      const properties = propertiesToMap(configDetails as Record<string, unknown>);
 
       // Edit mode - launch interactive editor
       if (options.edit) {
@@ -239,9 +254,10 @@ export const treeConfigCommand = new Command('config')
           // PUT the configuration back using the typed contract
           // Body type is Partial<Configuration> - we only send properties
           // Note: CSRF token is auto-initialized by the adapter before write operations
+          // Cast to unknown to bypass schema mismatch - TODO: align schema with actual API
           await client.adt.cts.transportrequests.searchconfiguration.configurations.put(
             configId,
-            configData
+            configData as unknown as Parameters<typeof client.adt.cts.transportrequests.searchconfiguration.configurations.put>[1]
           );
         };
 
diff --git a/packages/adt-cli/src/lib/commands/lock.ts b/packages/adt-cli/src/lib/commands/lock.ts
index 4206e4a4..7d86f400 100644
--- a/packages/adt-cli/src/lib/commands/lock.ts
+++ b/packages/adt-cli/src/lib/commands/lock.ts
@@ -1,103 +1,25 @@
 import { Command } from 'commander';
-import { AdtClientImpl } from '@abapify/adt-client';
 
-async function lockObject(objectName: string, options: any, command: any) {
-  const logger = command.parent?.logger;
+// TODO: Migrate to v2 client when lock/unlock contracts are available
+// This command requires v1-specific features: searchObjectsDetailed, lockObject
+// See: docs/plans/active/2025-12-20-adt-cli-api-compatibility.md
 
-  try {
-    console.log(`🔒 Locking object: ${objectName}`);
-
-    // Create ADT client with logger (only for verbose mode)
-    const client = new AdtClientImpl({
-      logger: logger?.child({ component: 'cli' }),
-    });
-
-    // Search for the object using ADT client search function
-    console.log(`🔍 Searching for object...`);
-
-    const searchOptions = {
-      operation: 'quickSearch' as const,
-      query: objectName,
-      maxResults: 2,
-    };
-    const result = await client.repository.searchObjectsDetailed(searchOptions);
-    const searchResults = result.objects || [];
-
-    if (searchResults.length === 0) {
-      console.error(`❌ Object '${objectName}' not found in SAP system`);
-      process.exit(1);
-    }
-
-    if (searchResults.length > 1) {
-      console.error(
-        `❌ Multiple objects found for '${objectName}'. Please be more specific:`
-      );
-      searchResults.forEach((obj: any, index: number) => {
-        console.log(`   ${index + 1}. ${obj.name} (${obj.type}) - ${obj.uri}`);
-      });
-      console.log(
-        `💡 Use a more specific name or add filters to narrow down the search`
-      );
-      process.exit(1);
-    }
-
-    const foundObject = searchResults[0];
-    const objectUri = foundObject.uri;
-
-    console.log(
-      `✅ Found: ${foundObject.name} (${foundObject.type}) - ${foundObject.description}`
-    );
-    console.log(`🔒 Attempting lock...`);
-
-    try {
-      const lockHandle = await client.repository.lockObject(objectUri);
-
-      console.log(`✅ SUCCESS! Object ${objectName} locked`);
-      console.log(`🔑 Lock handle: ${lockHandle}`);
-    } catch (error: any) {
-      const errorMessage = error?.message || String(error);
-      const statusCode = error?.statusCode || error?.context?.status;
-
-      console.error(`❌ Lock failed: ${errorMessage} (Status: ${statusCode})`);
-
-      // Show helpful error information
-      if (errorMessage.includes('currently editing')) {
-        console.log(
-          `💡 The object is already locked by another user or session`
-        );
-        console.log(
-          `   - Check transaction SM12 in SAP GUI to see who has the lock`
-        );
-        console.log(
-          `   - Use 'npx adt unlock ${objectName}' to force unlock if it's your lock`
-        );
-      } else if (errorMessage.includes('not found')) {
-        console.log(
-          `💡 The object might not exist or you don't have access to it`
-        );
-      } else {
-        console.log(`💡 The lock might have failed due to:`);
-        console.log(`   - Insufficient permissions`);
-        console.log(`   - Object is already locked`);
-        console.log(`   - Network or system issues`);
-      }
-
-      process.exit(1);
-    }
-  } catch (error) {
-    console.error(`❌ Lock failed:`, error);
-    process.exit(1);
-  }
+async function lockObject(objectName: string): Promise<void> {
+  // Stub implementation - command needs migration to v2 client
+  console.error(`❌ Lock command is temporarily disabled pending v2 client migration.`);
+  console.error(`   Object: ${objectName}`);
+  console.error(`💡 Use SAP GUI transaction SE80 or SM12 to manage locks.`);
+  process.exit(1);
 }
 
 export function createLockCommand(): Command {
   const command = new Command('lock');
 
   command
-    .description('Lock a SAP object by name')
+    .description('Lock a SAP object by name (temporarily disabled)')
     .argument('<objectName>', 'Name of the object to lock (e.g., ZIF_PETSTORE)')
-    .action(async (objectName: string, options: any, command: any) => {
-      await lockObject(objectName, options, command);
+    .action(async (objectName: string) => {
+      await lockObject(objectName);
     });
 
   return command;
diff --git a/packages/adt-cli/src/lib/commands/outline.ts b/packages/adt-cli/src/lib/commands/outline.ts
index 4ee5dc3b..4192ed4b 100644
--- a/packages/adt-cli/src/lib/commands/outline.ts
+++ b/packages/adt-cli/src/lib/commands/outline.ts
@@ -1,88 +1,16 @@
 import { Command } from 'commander';
-// TODO: ObjectRegistry was removed - needs ADK migration
-// import { ObjectRegistry } from '../objects/registry';
-import { IconRegistry } from '../utils/icon-registry';
-import { AdtClientImpl } from '@abapify/adt-client';
 
-// TODO: Stub until ADK migration
-const ObjectRegistry = {
-  isSupported: (_type: string) => false,
-  get: (_type: string, _client: unknown) => { throw new Error('ObjectRegistry needs ADK migration'); },
-};
+// TODO: Migrate to v2 client when outline contracts are available
+// This command requires v1-specific features: searchObjectsDetailed, ObjectRegistry
+// See: docs/plans/active/2025-12-20-adt-cli-api-compatibility.md
 
 export const outlineCommand = new Command('outline')
   .argument('<objectName>', 'ABAP object name to show outline for')
-  .description('Show object structure outline (methods, attributes, etc.)')
-  .action(async (objectName, options, command) => {
-    const logger = command.parent?.logger;
-
-    try {
-      // Create ADT client with logger
-      const adtClient = new AdtClientImpl({
-        logger: logger?.child({ component: 'cli' }),
-      });
-
-      // Search for the specific object by name
-      const searchOptions = {
-        operation: 'quickSearch',
-        query: objectName,
-        maxResults: 10,
-      };
-      const result = await adtClient.repository.searchObjectsDetailed(
-        searchOptions
-      );
-
-      // Find exact match
-      type SearchObject = { name: string; type: string; packageName?: string };
-      const exactMatch = result.objects.find(
-        (obj: SearchObject) => obj.name.toUpperCase() === objectName.toUpperCase()
-      );
-
-      if (!exactMatch) {
-        console.log(`❌ Object '${objectName}' not found`);
-
-        // Show similar objects if any
-        const similarObjects = result.objects.filter((obj: SearchObject) =>
-          obj.name.toUpperCase().includes(objectName.toUpperCase())
-        );
-
-        if (similarObjects.length > 0) {
-          console.log(`\n💡 Similar objects found:`);
-          similarObjects.slice(0, 5).forEach((obj: SearchObject) => {
-            const icon = IconRegistry.getIcon(obj.type);
-            console.log(
-              `   ${icon} ${obj.name} (${obj.type}) - ${obj.packageName}`
-            );
-          });
-        }
-        return;
-      }
-
-      // Check if object type is supported
-      if (!ObjectRegistry.isSupported(exactMatch.type)) {
-        console.log(
-          `❌ Outline not supported for object type: ${exactMatch.type}`
-        );
-        return;
-      }
-
-      // Show object structure only
-      try {
-        const objectHandler = ObjectRegistry.get(exactMatch.type, adtClient);
-        await objectHandler.getStructure(exactMatch.name);
-        console.log(); // Add spacing after outline
-      } catch (error) {
-        console.log(
-          `⚠️ Could not fetch outline: ${
-            error instanceof Error ? error.message : String(error)
-          }`
-        );
-      }
-    } catch (error) {
-      console.error(
-        `❌ Outline failed:`,
-        error instanceof Error ? error.message : String(error)
-      );
-      process.exit(1);
-    }
+  .description('Show object structure outline (temporarily disabled)')
+  .action(async (objectName: string) => {
+    // Stub implementation - command needs migration to v2 client
+    console.error(`❌ Outline command is temporarily disabled pending v2 client migration.`);
+    console.error(`   Object: ${objectName}`);
+    console.error(`💡 Use SAP GUI SE80 or ADT Eclipse to view object outlines.`);
+    process.exit(1);
   });
diff --git a/packages/adt-cli/src/lib/commands/package/get.ts b/packages/adt-cli/src/lib/commands/package/get.ts
index 7ca738df..d384214c 100644
--- a/packages/adt-cli/src/lib/commands/package/get.ts
+++ b/packages/adt-cli/src/lib/commands/package/get.ts
@@ -28,15 +28,19 @@ export const packageGetCommand = new Command('package')
 
       // Use router to render the package page
       const route = router.get('DEVC');
+      // Extract package data - response is wrapped in { package: ... }
+      const pkgData = (pkg as { package?: Record<string, unknown> }).package ?? pkg;
       if (route) {
-        const page = route.page(pkg, { name });
+        const page = route.page(pkgData, { name });
         render(page);
       } else {
         // Fallback: simple output
-        console.log(`📦 Package: ${pkg.name}`);
-        console.log(`   Type: ${pkg.type}`);
-        console.log(`   Description: ${pkg.description || 'N/A'}`);
-        console.log(`   Package Type: ${pkg.attributes?.packageType || 'N/A'}`);
+        const pkgAny = pkgData as Record<string, unknown>;
+        console.log(`📦 Package: ${pkgAny.name || name}`);
+        console.log(`   Type: ${pkgAny.type || 'N/A'}`);
+        console.log(`   Description: ${pkgAny.description || 'N/A'}`);
+        const attrs = pkgAny.attributes as Record<string, unknown> | undefined;
+        console.log(`   Package Type: ${attrs?.packageType || 'N/A'}`);
       }
     } catch (error) {
       console.error(
diff --git a/packages/adt-cli/src/lib/commands/repl/index.ts b/packages/adt-cli/src/lib/commands/repl/index.ts
index 5b7423c2..3cab3492 100644
--- a/packages/adt-cli/src/lib/commands/repl/index.ts
+++ b/packages/adt-cli/src/lib/commands/repl/index.ts
@@ -33,8 +33,10 @@ async function createFetchFn() {
 async function getSystemId(): Promise<string | undefined> {
   try {
     const adtClient = await getAdtClientV2();
-    const info = await adtClient.adt.core.http.systeminformation.getSystemInformation();
-    return info.systemID;
+    const info = await adtClient.adt.core.http.systeminformation.getSystemInfo();
+    // Response is parsed data with systemID property
+    const infoData = info as { systemID?: string };
+    return infoData.systemID;
   } catch {
     return undefined;
   }
diff --git a/packages/adt-cli/src/lib/commands/research-sessions.ts b/packages/adt-cli/src/lib/commands/research-sessions.ts
index 6f4369c9..d792b092 100644
--- a/packages/adt-cli/src/lib/commands/research-sessions.ts
+++ b/packages/adt-cli/src/lib/commands/research-sessions.ts
@@ -1,11 +1,13 @@
 /**
  * Research command for ADT Sessions endpoint
  * Usage: npx adt research-sessions [options]
+ * 
+ * TODO: Migrate to v2 client when sessions contracts are available
+ * This command requires v1-specific features: AdtClientImpl, raw request handling
+ * See: docs/plans/active/2025-12-20-adt-cli-api-compatibility.md
  */
 
-import { AdtClientImpl } from '@abapify/adt-client';
-import { createCliLogger } from '../utils/logger-config';
-import { writeFile } from 'fs/promises';
+import { Command } from 'commander';
 
 export interface SessionsResearchOptions {
   verbose?: boolean;
@@ -13,469 +15,20 @@ export interface SessionsResearchOptions {
   format?: 'console' | 'json' | 'xml';
 }
 
-interface SessionLink {
-  href: string;
-  rel: string;
-  type?: string;
-  title: string;
+export async function researchSessions(_options: SessionsResearchOptions): Promise<void> {
+  // Stub implementation - command needs migration to v2 client
+  console.error(`❌ Research-sessions command is temporarily disabled pending v2 client migration.`);
+  console.error(`💡 This is a development/debugging command that will be restored after v2 migration.`);
+  process.exit(1);
 }
 
-interface SessionData {
-  sessionLinks: SessionLink[];
-  properties: Record<string, string>;
-}
-
-interface ResearchResults {
-  mainSession: {
-    xml: string;
-    parsed: SessionData;
-  };
-  endpoints: Array<{
-    url: string;
-    title: string;
-    status: number;
-    contentType: string;
-    data: string;
-    error?: string;
-  }>;
-}
-
-/**
- * Parse sessions XML response
- */
-function parseSessionsXml(xml: string): SessionData {
-  const sessionLinks: SessionLink[] = [];
-  const properties: Record<string, string> = {};
-
-  // Extract atom:link elements with flexible regex
-  const linkRegex =
-    /<atom:link[^>]*href="([^"]*)"[^>]*rel="([^"]*)"[^>]*(?:type="([^"]*)"[^>]*)?title="([^"]*)"[^>]*\/?>/g;
-  let match;
-
-  while ((match = linkRegex.exec(xml)) !== null) {
-    sessionLinks.push({
-      href: match[1],
-      rel: match[2],
-      type: match[3] || undefined,
-      title: match[4],
+export function createResearchSessionsCommand(): Command {
+  return new Command('research-sessions')
+    .description('Research ADT sessions endpoint (temporarily disabled)')
+    .option('-v, --verbose', 'Enable verbose output')
+    .option('-o, --output <file>', 'Output file path')
+    .option('-f, --format <format>', 'Output format: console, json, xml', 'console')
+    .action(async (options: SessionsResearchOptions) => {
+      await researchSessions(options);
     });
-  }
-
-  // Extract properties
-  const propRegex =
-    /<http:property[^>]*name="([^"]*)"[^>]*>([^<]*)<\/http:property>/g;
-  while ((match = propRegex.exec(xml)) !== null) {
-    properties[match[1]] = match[2];
-  }
-
-  return { sessionLinks, properties };
-}
-
-/**
- * Format response data for display
- */
-function formatResponseData(data: string, contentType: string): string {
-  if (data.trim().startsWith('<?xml') || data.trim().startsWith('<')) {
-    return `📄 XML Response:\n${data}`;
-  } else if (data.trim().startsWith('{') || data.trim().startsWith('[')) {
-    try {
-      const parsed = JSON.parse(data);
-      return `📄 JSON Response:\n${JSON.stringify(parsed, null, 2)}`;
-    } catch {
-      return `📄 Text Response:\n${data}`;
-    }
-  } else {
-    return `📄 Text Response:\n${data}`;
-  }
 }
-
-/**
- * Research ADT sessions endpoint and related endpoints
- */
-export async function researchSessions(
-  options: SessionsResearchOptions = {}
-): Promise<void> {
-  const logger = createCliLogger({ verbose: options.verbose });
-  const results: ResearchResults = {
-    mainSession: { xml: '', parsed: { sessionLinks: [], properties: {} } },
-    endpoints: [],
-  };
-
-  try {
-    logger.info('🧪 Starting ADT Sessions Research');
-
-    // Try to force a fresh authentication session
-    logger.info('🔄 Creating fresh ADT client connection...');
-    const client = new AdtClientImpl({
-      logger: logger?.child({ component: 'research-sessions' }),
-    });
-
-    // Force connection establishment (this might trigger fresh auth)
-    await client.connect({} as any);
-
-    // 1. Try preflight_logon first (ADT preliminary check)
-    logger.info('🚀 Trying preflight_logon call...');
-    const timestamp = Date.now();
-    const preflightResponse = await client.request(
-      `/sap/bc/adt/core/http/sessions?_=${timestamp}`,
-      {
-        headers: {
-          Accept:
-            'application/vnd.sap.adt.core.http.session.v3+xml, application/vnd.sap.adt.core.http.session.v2+xml, application/vnd.sap.adt.core.http.session.v1+xml',
-          'User-Agent':
-            'Eclipse/4.36.0.v20250528-1830 (linux; x86_64; Java 21.0.8) ADT/3.52.0 (research)',
-          'sap-adt-purpose': 'preflight_logon',
-          'x-sap-security-session': 'create',
-        },
-      }
-    );
-
-    const preflightXml = await preflightResponse.text();
-    const preflightParsed = parseSessionsXml(preflightXml);
-
-    console.log('\n🚀 Preflight Logon Response:');
-    console.log('='.repeat(50));
-    console.log(`Status: ${preflightResponse.status}`);
-    console.log(
-      `Content-Type: ${
-        preflightResponse.headers.get('content-type') || 'unknown'
-      }`
-    );
-    console.log(`Links Found: ${preflightParsed.sessionLinks.length}`);
-
-    preflightParsed.sessionLinks.forEach((link, i) => {
-      console.log(`  ${i + 1}. ${link.title}`);
-      console.log(`     → ${link.href}`);
-      console.log(`     → rel: ${link.rel}`);
-      if (link.type) console.log(`     → type: ${link.type}`);
-      console.log();
-    });
-
-    // 2. Research main sessions endpoint (should now be freshly authenticated)
-    logger.info('📡 Fetching main sessions endpoint with fresh auth...');
-    console.log('🔍 Authentication State: Fresh connection established');
-    const mainResponse = await client.request(
-      '/sap/bc/adt/core/http/sessions',
-      {
-        headers: {
-          Accept:
-            'application/vnd.sap.adt.core.http.session.v3+xml, application/vnd.sap.adt.core.http.session.v2+xml, application/vnd.sap.adt.core.http.session.v1+xml',
-          'User-Agent':
-            'Eclipse/4.36.0.v20250528-1830 (linux; x86_64; Java 21.0.8) ADT/3.52.0 (research)',
-          'X-sap-adt-profiling': 'server-time',
-          'sap-adt-purpose': 'logon',
-          'sap-adt-saplb': 'fetch',
-          'sap-cancel-on-close': 'true',
-          'x-sap-security-session': 'create',
-        },
-      }
-    );
-    const sessionsXml = await mainResponse.text();
-
-    results.mainSession.xml = sessionsXml;
-    results.mainSession.parsed = parseSessionsXml(sessionsXml);
-
-    if (options.format === 'console' || !options.format) {
-      console.log('\n🔍 Main Sessions Endpoint Analysis:');
-      console.log('='.repeat(50));
-      console.log(`Status: ${mainResponse.status}`);
-      console.log(
-        `Content-Type: ${mainResponse.headers.get('content-type') || 'unknown'}`
-      );
-
-      if (options.verbose) {
-        console.log('\n📄 Raw XML Response:');
-        console.log(sessionsXml);
-      }
-
-      console.log('\n🔗 Session Links Found:');
-      results.mainSession.parsed.sessionLinks.forEach((link, i) => {
-        console.log(`  ${i + 1}. ${link.title}`);
-        console.log(`     → ${link.href}`);
-        console.log(`     → rel: ${link.rel}`);
-        if (link.type) console.log(`     → type: ${link.type}`);
-        console.log();
-      });
-
-      console.log('⚙️  Session Properties:');
-      Object.entries(results.mainSession.parsed.properties).forEach(
-        ([key, value]) => {
-          const displayValue =
-            key === 'inactivityTimeout'
-              ? `${value} seconds (${Math.floor(Number(value) / 60)} minutes)`
-              : value;
-          console.log(`  ${key}: ${displayValue}`);
-        }
-      );
-    }
-
-    // 2. Compare with existing session query (no fresh auth)
-    logger.info('🔍 Comparing with existing session query...');
-    try {
-      const existingClient = new AdtClientImpl({
-        logger: logger?.child({ component: 'existing-session' }),
-      });
-
-      const existingResponse = await existingClient.request(
-        '/sap/bc/adt/core/http/sessions',
-        {
-          headers: {
-            Accept: 'application/vnd.sap.adt.core.http.session.v3+xml',
-            'sap-adt-purpose': 'query', // Different purpose - just querying
-            'x-sap-security-session': 'use', // Use existing, don't create
-          },
-        }
-      );
-
-      const existingXml = await existingResponse.text();
-      const existingParsed = parseSessionsXml(existingXml);
-
-      console.log('\n📊 Comparison Results:');
-      console.log('='.repeat(50));
-      console.log(
-        `Fresh Auth Links: ${results.mainSession.parsed.sessionLinks.length}`
-      );
-      console.log(
-        `Existing Session Links: ${existingParsed.sessionLinks.length}`
-      );
-
-      if (
-        results.mainSession.parsed.sessionLinks.length !==
-        existingParsed.sessionLinks.length
-      ) {
-        console.log(
-          '🎯 DIFFERENCE DETECTED! Fresh auth returned different results!'
-        );
-      } else {
-        console.log('⚠️  Same number of links returned');
-      }
-    } catch (error: any) {
-      console.error('❌ Existing session query failed:', error.message);
-    }
-
-    // 3. Try CSRF token fetch call (different purpose)
-    logger.info('🔍 Trying CSRF token fetch call...');
-    try {
-      const csrfResponse = await client.request(
-        '/sap/bc/adt/core/http/sessions',
-        {
-          headers: {
-            Accept: '*/*',
-            'User-Agent':
-              'Eclipse/4.36.0.v20250528-1830 (linux; x86_64; Java 21.0.8) ADT/3.52.0 (research)',
-            'X-sap-adt-profiling': 'server-time',
-            'sap-adt-purpose': 'fetch-csrf-token',
-            'sap-adt-saplb': 'fetch',
-            'sap-cancel-on-close': 'true',
-            'x-csrf-token': 'fetch',
-            'x-sap-security-session': 'use',
-          },
-        }
-      );
-
-      const csrfXml = await csrfResponse.text();
-      console.log('\n🔑 CSRF Token Fetch Response:');
-      console.log('='.repeat(50));
-      console.log(`Status: ${csrfResponse.status}`);
-      console.log(
-        `Content-Type: ${csrfResponse.headers.get('content-type') || 'unknown'}`
-      );
-
-      // Check for CSRF token in response headers
-      const csrfToken = csrfResponse.headers.get('x-csrf-token');
-      if (csrfToken) {
-        console.log(`🎯 CSRF Token: ${csrfToken}`);
-      }
-
-      if (options.verbose) {
-        console.log('\n📄 CSRF Response Body:');
-        console.log(csrfXml);
-      }
-
-      // Parse this response too
-      const csrfParsed = parseSessionsXml(csrfXml);
-      console.log('\n🔗 CSRF Session Links Found:');
-      csrfParsed.sessionLinks.forEach((link, i) => {
-        console.log(`  ${i + 1}. ${link.title}`);
-        console.log(`     → ${link.href}`);
-        console.log(`     → rel: ${link.rel}`);
-        if (link.type) console.log(`     → type: ${link.type}`);
-        console.log();
-      });
-    } catch (error: any) {
-      console.error('❌ CSRF token fetch failed:', error.message);
-    }
-
-    // 4. Research each discovered endpoint
-    logger.info('🔍 Researching discovered endpoints...');
-
-    for (const link of results.mainSession.parsed.sessionLinks) {
-      try {
-        if (options.format === 'console' || !options.format) {
-          console.log(`\n📍 Researching: ${link.title}`);
-          console.log(`🌐 GET ${link.href}`);
-        }
-
-        // Determine appropriate headers based on endpoint
-        const headers: Record<string, string> = {};
-
-        if (link.href.includes('/sessions/')) {
-          // Security session endpoint
-          headers['Accept'] =
-            'application/vnd.sap.adt.core.http.session.v3+xml';
-        } else if (link.href.includes('systeminformation')) {
-          // System information endpoint
-          headers['Accept'] =
-            'application/vnd.sap.adt.core.http.systeminformation.v1+json';
-        } else {
-          // Default for other endpoints
-          headers['Accept'] = 'application/xml,text/html,*/*';
-        }
-
-        const linkResponse = await client.request(link.href, { headers });
-        const linkData = await linkResponse.text();
-
-        const endpointResult = {
-          url: link.href,
-          title: link.title,
-          status: linkResponse.status,
-          contentType: linkResponse.headers.get('content-type') || 'unknown',
-          data: linkData,
-        };
-
-        results.endpoints.push(endpointResult);
-
-        if (options.format === 'console' || !options.format) {
-          console.log(`✅ Status: ${linkResponse.status}`);
-          console.log(`📦 Content-Type: ${endpointResult.contentType}`);
-
-          if (options.verbose) {
-            console.log(
-              formatResponseData(linkData, endpointResult.contentType)
-            );
-          } else {
-            // Show truncated response
-            const preview =
-              linkData.length > 300
-                ? linkData.substring(0, 300) + '...'
-                : linkData;
-            console.log(`📄 Response Preview:\n${preview}`);
-          }
-        }
-
-        // Small delay between requests
-        await new Promise((resolve) => setTimeout(resolve, 500));
-      } catch (error: any) {
-        const errorResult = {
-          url: link.href,
-          title: link.title,
-          status: error.context?.status || 0,
-          contentType: 'error',
-          data: '',
-          error: error.message,
-        };
-
-        results.endpoints.push(errorResult);
-
-        if (options.format === 'console' || !options.format) {
-          console.error(`❌ Failed to research ${link.href}: ${error.message}`);
-          if (error.context?.status) {
-            console.error(`   Status: ${error.context.status}`);
-          }
-        }
-      }
-    }
-
-    // 3. Output results
-    if (options.output) {
-      let outputContent: string;
-
-      if (options.format === 'json') {
-        outputContent = JSON.stringify(results, null, 2);
-      } else if (options.format === 'xml') {
-        outputContent = results.mainSession.xml;
-      } else {
-        // Default: human-readable format
-        outputContent = generateReportContent(results);
-      }
-
-      await writeFile(options.output, outputContent, 'utf-8');
-      logger.info(`📁 Results saved to: ${options.output}`);
-    }
-
-    if (options.format === 'console' || !options.format) {
-      console.log('\n🎉 Sessions research complete!');
-      console.log('\n💡 Key Findings:');
-      console.log(
-        '• Session endpoint provides security URLs, logoff links, and system info'
-      );
-      console.log(
-        '• Security session URLs contain session-specific authentication data'
-      );
-      console.log('• System information provides JSON system metadata');
-      console.log(
-        `• Session timeout: ${
-          results.mainSession.parsed.properties.inactivityTimeout || 'unknown'
-        } seconds`
-      );
-    }
-  } catch (error: any) {
-    logger.error('💥 Sessions research failed:', error.message);
-    if (error.context) {
-      logger.error('Response:', error.context.response);
-    }
-    throw error;
-  }
-}
-
-/**
- * Generate human-readable report content
- */
-function generateReportContent(results: ResearchResults): string {
-  const report = [
-    '# ADT Sessions Endpoint Research Report',
-    '='.repeat(50),
-    '',
-    '## Main Sessions Endpoint',
-    `URL: /sap/bc/adt/core/http/sessions`,
-    '',
-    '### Session Properties:',
-    ...Object.entries(results.mainSession.parsed.properties).map(
-      ([key, value]) => `- ${key}: ${value}`
-    ),
-    '',
-    '### Discovered Endpoints:',
-    ...results.mainSession.parsed.sessionLinks.map(
-      (link, i) =>
-        `${i + 1}. **${link.title}**\n   - URL: ${
-          link.href
-        }\n   - Relationship: ${link.rel}\n   - Type: ${link.type || 'N/A'}`
-    ),
-    '',
-    '## Endpoint Research Results',
-    '',
-    ...results.endpoints.map((endpoint) =>
-      [
-        `### ${endpoint.title}`,
-        `- URL: ${endpoint.url}`,
-        `- Status: ${endpoint.status}`,
-        `- Content-Type: ${endpoint.contentType}`,
-        endpoint.error ? `- Error: ${endpoint.error}` : '',
-        endpoint.data && !endpoint.error
-          ? `- Response Length: ${endpoint.data.length} characters`
-          : '',
-        '',
-      ]
-        .filter((line) => line !== '')
-        .join('\n')
-    ),
-    '',
-    '## Summary',
-    'This report documents the ADT sessions endpoint and its related resources.',
-    'The sessions endpoint provides essential session management information for ADT clients.',
-  ];
-
-  return report.join('\n');
-}
-
-export default researchSessions;
diff --git a/packages/adt-cli/src/lib/commands/search.ts b/packages/adt-cli/src/lib/commands/search.ts
index ad7b2727..636ecbe4 100644
--- a/packages/adt-cli/src/lib/commands/search.ts
+++ b/packages/adt-cli/src/lib/commands/search.ts
@@ -21,7 +21,16 @@ export const searchCommand = new Command('search')
 
       // Handle results - define type for search objects
       type SearchObject = { name?: string; type?: string; uri?: string; description?: string; packageName?: string };
-      const rawObjects = results.objectReference;
+      // Results can come in different shapes depending on response - handle both
+      const resultsAny = results as Record<string, unknown>;
+      let rawObjects: SearchObject | SearchObject[] | undefined;
+      if ('objectReferences' in resultsAny && resultsAny.objectReferences) {
+        const refs = resultsAny.objectReferences as { objectReference?: SearchObject | SearchObject[] };
+        rawObjects = refs.objectReference;
+      } else if ('mainObject' in resultsAny && resultsAny.mainObject) {
+        const main = resultsAny.mainObject as { objectReference?: SearchObject | SearchObject[] };
+        rawObjects = main.objectReference;
+      }
       const objects: SearchObject[] = rawObjects
         ? (Array.isArray(rawObjects) ? rawObjects : [rawObjects])
         : [];
diff --git a/packages/adt-cli/src/lib/commands/unlock/index.ts b/packages/adt-cli/src/lib/commands/unlock/index.ts
index 80c1c88b..d73fefcf 100644
--- a/packages/adt-cli/src/lib/commands/unlock/index.ts
+++ b/packages/adt-cli/src/lib/commands/unlock/index.ts
@@ -1,123 +1,22 @@
 import { Command } from 'commander';
-import { AdtClientImpl } from '@abapify/adt-client';
 
-async function unlockObject(objectName: string, options: any, command: any) {
-  const logger = command.parent?.logger;
+// TODO: Migrate to v2 client when lock/unlock contracts are available
+// This command requires v1-specific features: searchObjectsDetailed, unlockObject
+// See: docs/plans/active/2025-12-20-adt-cli-api-compatibility.md
 
-  try {
-    console.log(`🔓 Unlocking object: ${objectName}`);
-
-    // Create ADT client with logger (only for verbose mode)
-    const client = new AdtClientImpl({
-      logger: logger?.child({ component: 'cli' }),
-    });
-
-    // Search for the object using ADT client search function
-    console.log(`🔍 Searching for object...`);
-
-    const searchOptions = {
-      operation: 'quickSearch' as const,
-      query: objectName,
-      maxResults: 2,
-    };
-    const result = await client.repository.searchObjectsDetailed(searchOptions);
-    const searchResults = result.objects || [];
-
-    if (searchResults.length === 0) {
-      console.error(`❌ Object '${objectName}' not found in SAP system`);
-      process.exit(1);
-    }
-
-    if (searchResults.length > 1) {
-      console.error(
-        `❌ Multiple objects found for '${objectName}'. Please be more specific:`
-      );
-      searchResults.forEach((obj: any, index: number) => {
-        console.log(`   ${index + 1}. ${obj.name} (${obj.type}) - ${obj.uri}`);
-      });
-      console.log(
-        `💡 Use a more specific name or add filters to narrow down the search`
-      );
-      process.exit(1);
-    }
-
-    const foundObject = searchResults[0];
-    const objectUri = foundObject.uri;
-
-    console.log(
-      `✅ Found: ${foundObject.name} (${foundObject.type}) - ${foundObject.description}`
-    );
-
-    // Determine unlock method based on whether lock handle is provided
-    if (options.lockHandle) {
-      console.log(
-        `🔓 Attempting unlock with lock handle: ${options.lockHandle}`
-      );
-
-      try {
-        await client.repository.unlockObject(objectUri, options.lockHandle);
-
-        console.log(
-          `✅ SUCCESS! Object ${objectName} unlocked with lock handle`
-        );
-      } catch (error: any) {
-        console.error(
-          `❌ Unlock with lock handle failed, trying generic unlock...`
-        );
-        // Fall back to generic unlock
-        try {
-          await client.repository.unlockObject(objectUri);
-          console.log(`✅ SUCCESS! Object ${objectName} unlocked`);
-        } catch (genericError: any) {
-          const errorMessage = genericError?.message || String(genericError);
-          const statusCode =
-            genericError?.statusCode || genericError?.context?.status;
-
-          console.error(
-            `❌ Generic unlock also failed: ${errorMessage} (Status: ${statusCode})`
-          );
-
-          console.log(`💡 The object might:`);
-          console.log(`   - Already be unlocked`);
-          console.log(`   - Be locked by another user`);
-          console.log(`   - Require manual unlock via SM12 transaction`);
-          throw genericError;
-        }
-      }
-    } else {
-      console.log(`🔓 Attempting generic unlock (no lock handle provided)...`);
-      try {
-        await client.repository.unlockObject(objectUri);
-        console.log(`✅ SUCCESS! Object ${objectName} unlocked`);
-      } catch (error: any) {
-        const errorMessage = error?.message || String(error);
-        const statusCode = error?.statusCode || error?.context?.status;
-
-        console.error(
-          `❌ Generic unlock failed: ${errorMessage} (Status: ${statusCode})`
-        );
-
-        console.log(`💡 The object might:`);
-        console.log(`   - Already be unlocked`);
-        console.log(`   - Be locked by another user`);
-        console.log(`   - Require manual unlock via SM12 transaction`);
-        console.log(
-          `   - Need a specific lock handle (use --lock-handle flag)`
-        );
-        throw error;
-      }
-    }
-  } catch (error) {
-    console.error(`❌ Unlock failed:`, error);
-    process.exit(1);
-  }
+async function unlockObject(objectName: string): Promise<void> {
+  // Stub implementation - command needs migration to v2 client
+  console.error(`❌ Unlock command is temporarily disabled pending v2 client migration.`);
+  console.error(`   Object: ${objectName}`);
+  console.error(`💡 Use SAP GUI transaction SE80 or SM12 to manage locks.`);
+  process.exit(1);
 }
 
 export function createUnlockCommand(): Command {
   const command = new Command('unlock');
 
   command
-    .description('Unlock a SAP object by name')
+    .description('Unlock a SAP object by name (temporarily disabled)')
     .argument(
       '<objectName>',
       'Name of the object to unlock (e.g., ZIF_PETSTORE)'
@@ -126,8 +25,8 @@ export function createUnlockCommand(): Command {
       '--lock-handle <handle>',
       'Specific lock handle to unlock (more reliable than generic unlock)'
     )
-    .action(async (objectName: string, options: any, command: any) => {
-      await unlockObject(objectName, options, command);
+    .action(async (objectName: string) => {
+      await unlockObject(objectName);
     });
 
   return command;
diff --git a/packages/adt-cli/src/lib/config/index.ts b/packages/adt-cli/src/lib/config/index.ts
index b43746f8..7b5b0481 100644
--- a/packages/adt-cli/src/lib/config/index.ts
+++ b/packages/adt-cli/src/lib/config/index.ts
@@ -1,4 +1,4 @@
 export * from './interfaces';
-export * from './loader';
+export { ConfigLoader } from './loader';
 export * from './auth';
 export * from './validation';
diff --git a/packages/adt-cli/src/lib/config/validation.ts b/packages/adt-cli/src/lib/config/validation.ts
index b30a3120..4c93a559 100644
--- a/packages/adt-cli/src/lib/config/validation.ts
+++ b/packages/adt-cli/src/lib/config/validation.ts
@@ -81,10 +81,11 @@ export class ConfigValidator {
         );
       }
 
-      // Validate version if specified
-      if (plugin.version && !this.isValidSemver(plugin.version)) {
+      // Validate version if specified (version is optional on PluginSpec)
+      const pluginWithVersion = plugin as { name: string; version?: string; config?: unknown };
+      if (pluginWithVersion.version && !this.isValidSemver(pluginWithVersion.version)) {
         warnings.push(
-          `Plugin ${plugin.name} has invalid version format: ${plugin.version}`
+          `Plugin ${plugin.name} has invalid version format: ${pluginWithVersion.version}`
         );
       }
 
diff --git a/packages/adt-cli/src/lib/plugins/errors.ts b/packages/adt-cli/src/lib/plugins/errors.ts
index aced5bbf..57e45533 100644
--- a/packages/adt-cli/src/lib/plugins/errors.ts
+++ b/packages/adt-cli/src/lib/plugins/errors.ts
@@ -11,7 +11,7 @@ export class PluginError extends Error {
       | 'validation'
       | 'filesystem',
     public readonly context?: Record<string, unknown>,
-    public readonly cause?: Error
+    public override readonly cause?: Error
   ) {
     super(message);
     this.name = 'PluginError';
diff --git a/packages/adt-cli/src/lib/plugins/mock-e2e.test.ts b/packages/adt-cli/src/lib/plugins/mock-e2e.test.ts
index a4be09f5..5681b943 100644
--- a/packages/adt-cli/src/lib/plugins/mock-e2e.test.ts
+++ b/packages/adt-cli/src/lib/plugins/mock-e2e.test.ts
@@ -177,16 +177,7 @@ describe('Plugin Architecture E2E Tests', () => {
   // These tests should be rewritten to use proper ADK integration tests
 
   it('should handle multiple plugins with format selection', async () => {
-    const _config: CliConfig = {
-      auth: {
-        type: 'mock',
-        mock: { enabled: true },
-      },
-      plugins: {
-        formats: [{ name: '@abapify/oat' }, { name: '@abapify/abapgit' }],
-      },
-    };
-
+    // Config would be used in a real CLI scenario - kept for documentation
     // Simulate CLI behavior: multiple plugins available, no default
     const availableFormats = pluginRegistry.getAvailableFormats();
     expect(availableFormats).toHaveLength(2);
diff --git a/packages/adt-cli/src/lib/ui/index.ts b/packages/adt-cli/src/lib/ui/index.ts
index fe2e0589..c388633d 100644
--- a/packages/adt-cli/src/lib/ui/index.ts
+++ b/packages/adt-cli/src/lib/ui/index.ts
@@ -15,7 +15,7 @@ export { Field, Section, Box, Text } from './components';
 
 // Pages
 export { AdtCorePage, GenericPage } from './pages';
-export type { AdtCoreObject, AdtCorePageOptions, Package } from './pages';
+export type { AdtCoreObject, AdtCorePageOptions } from './pages';
 
 // Router
 export { router, type Route, type AdtClient } from './router';
diff --git a/packages/adt-client/src/index.ts b/packages/adt-client/src/index.ts
index d4cfbcc7..7d94eba0 100644
--- a/packages/adt-client/src/index.ts
+++ b/packages/adt-client/src/index.ts
@@ -39,12 +39,8 @@ export {
 export {
   type ResponsePlugin,
   type ResponseContext,
-  type FileStorageOptions,
-  type TransformFunction,
   type LogFunction,
   type FileLoggingConfig,
-  FileStoragePlugin,
-  TransformPlugin,
   LoggingPlugin,
   FileLoggingPlugin,
 } from './plugins';
diff --git a/packages/adt-client/src/plugins/file-storage.ts b/packages/adt-client/src/plugins/file-storage.ts
deleted file mode 100644
index e92b73f6..00000000
--- a/packages/adt-client/src/plugins/file-storage.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * File Storage Plugin - Saves raw XML and JSON responses to files
- */
-
-import type { ResponsePlugin, ResponseContext } from './types';
-
-export interface FileStorageOptions {
-  /** Base directory for storing files */
-  outputDir: string;
-  /** Save raw XML responses */
-  saveXml?: boolean;
-  /** Save parsed JSON responses */
-  saveJson?: boolean;
-  /** File naming function */
-  getFileName?: (context: ResponseContext) => string;
-}
-
-/**
- * File storage plugin - saves raw XML and JSON to files
- */
-export class FileStoragePlugin implements ResponsePlugin {
-  name = 'file-storage';
-
-  constructor(private options: FileStorageOptions) {}
-
-  async process(context: ResponseContext): Promise<unknown> {
-    const { outputDir, saveXml, saveJson, getFileName } = this.options;
-
-    // Generate filename
-    const baseFileName = getFileName
-      ? getFileName(context)
-      : this.defaultFileName(context);
-
-    // Save raw XML
-    if (saveXml && context.rawText) {
-      const xmlPath = `${outputDir}/${baseFileName}.xml`;
-      await this.writeFile(xmlPath, context.rawText);
-    }
-
-    // Save parsed JSON
-    if (saveJson && context.parsedData) {
-      const jsonPath = `${outputDir}/${baseFileName}.json`;
-      await this.writeFile(
-        jsonPath,
-        JSON.stringify(context.parsedData, null, 2)
-      );
-    }
-
-    // Return original parsed data
-    return context.parsedData;
-  }
-
-  private defaultFileName(context: ResponseContext): string {
-    // Extract endpoint from URL
-    const url = new URL(context.url);
-    const endpoint = url.pathname
-      .replace(/^\/sap\/bc\/adt\//, '')
-      .replace(/\//g, '-')
-      .replace(/[^a-zA-Z0-9-]/g, '_');
-
-    const timestamp = Date.now();
-    return `${endpoint}-${timestamp}`;
-  }
-
-  private async writeFile(path: string, content: string): Promise<void> {
-    const fs = await import('fs/promises');
-    const pathModule = await import('path');
-
-    // Ensure directory exists
-    const dir = pathModule.dirname(path);
-    await fs.mkdir(dir, { recursive: true });
-
-    // Write file
-    await fs.writeFile(path, content, 'utf-8');
-  }
-}
diff --git a/packages/adt-client/src/plugins/index.ts b/packages/adt-client/src/plugins/index.ts
index 1c3ac13d..944d58c7 100644
--- a/packages/adt-client/src/plugins/index.ts
+++ b/packages/adt-client/src/plugins/index.ts
@@ -7,13 +7,9 @@
 
 // Export types
 export type { ResponsePlugin, ResponseContext } from './types';
-export type { FileStorageOptions } from './file-storage';
-export type { TransformFunction } from './transform';
 export type { LogFunction } from './logging';
 export type { FileLoggingConfig } from './file-logging';
 
 // Export plugin implementations
-export { FileStoragePlugin } from './file-storage';
-export { TransformPlugin } from './transform';
 export { LoggingPlugin } from './logging';
 export { FileLoggingPlugin } from './file-logging';
diff --git a/packages/adt-client/src/plugins/transform.ts b/packages/adt-client/src/plugins/transform.ts
deleted file mode 100644
index 69a091b2..00000000
--- a/packages/adt-client/src/plugins/transform.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Transform Plugin - Applies custom transformations to responses
- */
-
-import type { ResponsePlugin, ResponseContext } from './types';
-
-export type TransformFunction = (
-  context: ResponseContext
-) => unknown | Promise<unknown>;
-
-/**
- * Transform plugin - applies custom transformations
- */
-export class TransformPlugin implements ResponsePlugin {
-  name = 'transform';
-
-  constructor(private transformer: TransformFunction) {}
-
-  async process(context: ResponseContext): Promise<unknown> {
-    return await this.transformer(context);
-  }
-}
diff --git a/packages/adt-client/tsconfig.json b/packages/adt-client/tsconfig.json
index 94e1a032..25748cdd 100644
--- a/packages/adt-client/tsconfig.json
+++ b/packages/adt-client/tsconfig.json
@@ -10,6 +10,9 @@
   },
   "include": ["src/**/*"],
   "references": [
+    {
+      "path": "../adt-schemas"
+    },
     {
       "path": "../adt-contracts"
     },
diff --git a/packages/adt-contracts/tests/contracts/atc.test.ts b/packages/adt-contracts/tests/contracts/atc.test.ts
index b769ae49..8d7ed983 100644
--- a/packages/adt-contracts/tests/contracts/atc.test.ts
+++ b/packages/adt-contracts/tests/contracts/atc.test.ts
@@ -29,7 +29,7 @@ class AtcWorklistsScenario extends ContractScenario {
       contract: () => worklistsContract.get('WL123'),
       method: 'GET',
       path: '/sap/bc/adt/atc/worklists/WL123',
-      headers: { Accept: 'application/xml' },
+      headers: { Accept: '*/*' },
       response: {
         status: 200,
         schema: atcworklist,
@@ -41,7 +41,7 @@ class AtcWorklistsScenario extends ContractScenario {
       contract: () => worklistsContract.get('WL123', { timestamp: '2024-01-01', includeExemptedFindings: 'true' }),
       method: 'GET',
       path: '/sap/bc/adt/atc/worklists/WL123',
-      headers: { Accept: 'application/xml' },
+      headers: { Accept: '*/*' },
       query: { timestamp: '2024-01-01', includeExemptedFindings: 'true' },
       response: { status: 200, schema: atcworklist },
     },
@@ -50,7 +50,7 @@ class AtcWorklistsScenario extends ContractScenario {
       contract: () => worklistsContract.objectset('WL123', 'MY_OBJECT_SET'),
       method: 'GET',
       path: '/sap/bc/adt/atc/worklists/WL123/MY_OBJECT_SET',
-      headers: { Accept: 'application/xml' },
+      headers: { Accept: '*/*' },
       response: { status: 200, schema: atcworklist },
     },
   ];