making more stable by fixing a few existing bypass on the tests

Author: igorcosta

src/import/index.ts

@@ -7,8 +7,8 @@
  * interactive (TTY) and non-interactive (CI/pipe) modes.
  */
 import chalk from 'chalk';
-import type { ImportOptions, ImportSource, ImportCategory, ImportResult } from './types.js';
-import { IMPORT_SOURCES, ALL_CATEGORIES } from './types.js';
+import type { ImportOptions, ImportCategory, ImportResult } from './types.js';
+import { IMPORT_SOURCES } from './types.js';
 
 /**
  * Run the import command.

src/modes/acp/adapter.ts

@@ -111,10 +111,7 @@ export class AutohandAcpAdapter implements Agent {
   }
 
   private cloneConfigOptions(options: SessionConfigOption[]): SessionConfigOption[] {
-    return options.map((opt) => ({
-      ...opt,
-      options: opt.options.map((valueOption) => ({ ...valueOption })),
-    }));
+    return structuredClone(options);
   }
 
   private getSessionConfigOptions(sessionId: string): SessionConfigOption[] {
@@ -141,13 +138,13 @@ export class AutohandAcpAdapter implements Agent {
     }
 
     return mcpServers.map((server): McpServerConfig => {
-      if (server.type === 'stdio') {
+      if ('command' in server) {
         return {
           name: server.name,
           transport: 'stdio',
           command: server.command,
           args: [...server.args],
-          env: Object.fromEntries(server.env.map((variable) => [variable.name, variable.value])),
+          env: Object.fromEntries(server.env.map((variable: { name: string; value: string }) => [variable.name, variable.value])),
           autoConnect: true,
         };
       }
@@ -156,7 +153,7 @@ export class AutohandAcpAdapter implements Agent {
         name: server.name,
         transport: server.type,
         url: server.url,
-        headers: Object.fromEntries(server.headers.map((header) => [header.name, header.value])),
+        headers: Object.fromEntries(server.headers.map((header: { name: string; value: string }) => [header.name, header.value])),
         autoConnect: true,
       };
     });
@@ -646,7 +643,16 @@ export class AutohandAcpAdapter implements Agent {
       throw RequestError.invalidParams({ message: `Unknown config option: ${params.configId}` });
     }
 
-    const validValues = option.options.map((entry) => entry.value);
+    const validValues: string[] = [];
+    for (const entry of option.options) {
+      if ('value' in entry) {
+        validValues.push(entry.value);
+      } else if ('options' in entry) {
+        for (const subEntry of entry.options) {
+          validValues.push(subEntry.value);
+        }
+      }
+    }
     if (!validValues.includes(params.value)) {
       throw RequestError.invalidParams({
         message: `Invalid value "${params.value}" for config option "${params.configId}"`,

tests/import/BaseImporter.test.ts

@@ -3,7 +3,7 @@
  * Copyright 2025 Autohand AI LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
 import os from 'node:os';
 import path from 'node:path';
 import type { ImportSource, ImportCategory, ImportScanResult, ImportResult, ProgressCallback } from '../../src/import/types.js';
@@ -367,7 +367,7 @@ describe('BaseImporter', () => {
       vi.mocked(fse.readJson).mockRejectedValue(new Error('not found') as never);
       vi.mocked(fse.pathExists).mockResolvedValue(false as never);
 
-      const { status, ...optsWithoutStatus } = baseOpts;
+      const { status: _status, ...optsWithoutStatus } = baseOpts;
       await importer.testWriteAutohandSession(optsWithoutStatus);
 
       const writeJsonCalls = vi.mocked(fse.writeJson).mock.calls;

tests/import/types.test.ts

@@ -325,7 +325,7 @@ describe('Import types', () => {
           return { source: 'claude' as ImportSource, imported: new Map(), errors: [], duration: 0 };
         },
       };
-      await importer.import(['sessions'], (p) => { progressCalled = true; });
+      await importer.import(['sessions'], (_p) => { progressCalled = true; });
       expect(progressCalled).toBe(true);
     });
   });