refactor(types): consolidate type system — resolve collisions, break circular deps, absorb server types

src/cli/commands/authProviders.ts

@@ -13,7 +13,7 @@ import { AuthProviderFactory } from "../../lib/auth/AuthProviderFactory.js";
 import type {
   AuthProviderConfig,
   AuthProviderType,
-} from "../../lib/types/authTypes.js";
+} from "../../lib/types/index.js";
 import { logger } from "../../lib/utils/logger.js";
 
 /**

src/cli/commands/evaluate.ts

@@ -26,7 +26,7 @@ import type {
   PipelineConfig,
   ScorerInput,
   ReportFormat,
-} from "../../lib/types/scorerTypes.js";
+} from "../../lib/types/index.js";
 import { logger } from "../../lib/utils/logger.js";
 
 /**

src/cli/commands/mcp.d.ts

@@ -4,7 +4,7 @@
  * Real MCP server connectivity and management
  */
 import type { Argv } from "yargs";
-import type { JsonValue } from "../../lib/types/common.js";
+import type { JsonValue } from "../../lib/types/index.js";
 type MCPServerConfig = {
     name: string;
     command: string;

src/cli/commands/mcp.ts

@@ -12,14 +12,14 @@
  */
 
 import type { CommandModule, Argv } from "yargs";
-import type { UnknownRecord } from "../../lib/types/common.js";
+import type { UnknownRecord } from "../../lib/types/index.js";
 import type {
   MCPServerInfo,
   MCPStatus,
   MCPTransportType,
-} from "../../lib/types/mcpTypes.js";
+} from "../../lib/types/index.js";
 import { createExternalServerInfo } from "../../lib/utils/mcpDefaults.js";
-import type { MCPCommandArgs } from "../../lib/types/cli.js";
+import type { MCPCommandArgs } from "../../lib/types/index.js";
 import { NeuroLink } from "../../lib/neurolink.js";
 import { logger } from "../../lib/utils/logger.js";
 import chalk from "chalk";

src/cli/commands/models.ts

@@ -6,8 +6,8 @@
 
 import type { CommandModule, Argv } from "yargs";
 import type { AIProviderName } from "../../lib/constants/enums.js";
-import type { ModelsCommandArgs } from "../../lib/types/cli.js";
-import type { ModelPricing } from "../../lib/types/providers.js";
+import type { ModelsCommandArgs } from "../../lib/types/index.js";
+import type { ModelPricing } from "../../lib/types/index.js";
 import {
   ModelResolver,
   formatSearchResults,
@@ -25,7 +25,7 @@ import type {
   ModelSearchFilters,
   ModelCapabilities,
   UseCaseSuitability,
-} from "../../lib/types/modelTypes.js";
+} from "../../lib/types/index.js";
 import chalk from "chalk";
 import ora from "ora";
 

src/cli/commands/task.ts

@@ -31,8 +31,8 @@ import type {
   TaskManagerConfig,
   TaskExecutionMode,
   WorkerState,
-} from "../../lib/types/taskTypes.js";
-import { TASK_DEFAULTS } from "../../lib/types/taskTypes.js";
+} from "../../lib/types/index.js";
+import { TASK_DEFAULTS } from "../../lib/types/index.js";
 import {
   StateFileManager,
   isProcessRunning,

src/cli/commands/workflow.ts

@@ -11,7 +11,7 @@ import chalk from "chalk";
 import ora from "ora";
 import type { CommandModule } from "yargs";
 import type { WorkflowConfig } from "../../lib/workflow/types.js";
-import type { BaseCommandArgs } from "../../lib/types/cli.js";
+import type { BaseCommandArgs } from "../../lib/types/index.js";
 import type { AIProviderName } from "../../lib/constants/enums.js";
 
 /**

src/cli/errorHandler.ts

@@ -5,7 +5,7 @@ import {
   AuthorizationError,
   NetworkError,
   RateLimitError,
-} from "../lib/types/errors.js";
+} from "../lib/types/index.js";
 import { globalSession } from "../lib/session/globalSessionState.js";
 
 export function handleError(_error: Error, context: string): void {

src/cli/factories/commandFactory.ts

@@ -12,24 +12,24 @@ import type {
   GenerateCommandArgs,
   GenerateResult,
   StreamCommandArgs,
-} from "../../lib/types/cli.js";
-import type { JsonValue } from "../../lib/types/common.js";
+} from "../../lib/types/index.js";
+import type { JsonValue } from "../../lib/types/index.js";
 // Use TokenUsage from standard types - no local interface needed
 import {
   type BaseContext,
   type ContextConfig,
   ContextFactory,
-} from "../../lib/types/contextTypes.js";
+} from "../../lib/types/index.js";
 import type {
   ConversationMemoryConfig,
   ConversationSummary,
-} from "../../lib/types/conversation.js";
+} from "../../lib/types/index.js";
 import type { AnalyticsData, TokenUsage } from "../../lib/types/index.js";
 import type {
   AnthropicAuthConfig,
   AnthropicAuthMethod,
   ClaudeSubscriptionTier,
-} from "../../lib/types/subscriptionTypes.js";
+} from "../../lib/types/index.js";
 
 import { checkRedisAvailability } from "../../lib/utils/conversationMemory.js";
 import { normalizeEvaluationData } from "../../lib/utils/evaluationUtils.js";

src/cli/factories/sagemakerCommandFactory.ts

@@ -7,7 +7,7 @@ import {
   ListEndpointsCommand,
   type EndpointSummary,
 } from "@aws-sdk/client-sagemaker";
-import type { UnknownRecord } from "../../lib/types/common.js";
+import type { UnknownRecord } from "../../lib/types/index.js";
 import { logger } from "../../lib/utils/logger.js";
 import {
   checkSageMakerConfiguration,
@@ -23,7 +23,7 @@ import {
 import type {
   DoGenerateModel,
   SecureConfiguration,
-} from "../../lib/types/cli.js";
+} from "../../lib/types/index.js";
 
 /**
  * Narrow a LanguageModel to a DoGenerateModel if it exposes doGenerate.

src/cli/loop/conversationSelector.ts

@@ -8,8 +8,8 @@ import chalk from "chalk";
 import type {
   RedisConversationObject,
   ConversationSummary,
-} from "../../lib/types/conversation.js";
-import type { RedisStorageConfig } from "../../lib/types/conversation.js";
+} from "../../lib/types/index.js";
+import type { RedisStorageConfig } from "../../lib/types/index.js";
 import type {
   ConversationChoice,
   MenuChoice,

src/cli/loop/optionsSchema.ts

@@ -1,6 +1,6 @@
 import { AIProviderName } from "../../lib/constants/enums.js";
-import type { OptionSchema } from "../../lib/types/cli.js";
-import type { TextGenerationOptions } from "../../lib/types/generateTypes.js";
+import type { OptionSchema } from "../../lib/types/index.js";
+import type { TextGenerationOptions } from "../../lib/types/index.js";
 
 /**
  * Master schema for all text generation options.

src/cli/loop/session.ts

@@ -8,12 +8,12 @@ import type {
   OptionSchema,
   RestorationToolContext,
   SessionRestoreResult,
-} from "../../lib/types/cli.js";
+} from "../../lib/types/index.js";
 import type {
   ConversationData,
   ConversationMemoryConfig,
   NeurolinkOptions,
-} from "../../lib/types/conversation.js";
+} from "../../lib/types/index.js";
 import { logger } from "../../lib/utils/logger.js";
 import {
   displayConversationPreview,

src/cli/utils/audioFileUtils.ts

@@ -13,7 +13,7 @@ import type {
   TTSResult,
   AudioSaveResult,
   AudioFormat,
-} from "../../lib/types/ttsTypes.js";
+} from "../../lib/types/index.js";
 
 /**
  * Format file size in human-readable format

src/cli/utils/envManager.ts

@@ -7,7 +7,7 @@
 import fs from "fs";
 import chalk from "chalk";
 import { logger } from "../../lib/utils/logger.js";
-import type { EnvBackupResult, EnvUpdateResult } from "../../lib/types/cli.js";
+import type { EnvBackupResult, EnvUpdateResult } from "../../lib/types/index.js";
 
 /**
  * Create a timestamped backup of the existing .env file

src/cli/utils/videoFileUtils.ts

@@ -10,7 +10,7 @@
 
 import fs from "fs";
 import path from "path";
-import type { VideoGenerationResult } from "../../lib/types/multimodal.js";
+import type { VideoGenerationResult } from "../../lib/types/index.js";
 
 /**
  * Result of saving video to file

src/lib/client/auth.ts

@@ -10,8 +10,8 @@
 import type {
   Middleware,
   AuthConfig,
-  OAuth2Config,
-  TokenRefreshResult,
+  ClientOAuth2Config,
+  ClientTokenRefreshResult,
 } from "../types/clientTypes.js";
 
 // =============================================================================
@@ -50,7 +50,7 @@ export class OAuth2TokenManager {
   private refreshBufferMs: number;
 
   constructor(
-    private readonly config: OAuth2Config,
+    private readonly config: ClientOAuth2Config,
     options?: { refreshBufferMs?: number },
   ) {
     this.refreshBufferMs = options?.refreshBufferMs ?? 60000;
@@ -150,7 +150,7 @@ export class OAuth2TokenManager {
       );
     }
 
-    const data = (await response.json()) as TokenRefreshResult;
+    const data = (await response.json()) as ClientTokenRefreshResult;
     this.token =
       data.accessToken ||
       (data as unknown as { access_token?: string }).access_token ||
@@ -208,7 +208,7 @@ export class JWTTokenManager {
     private readonly config: {
       token: string;
       expiresAt: number;
-      refreshFn: () => Promise<TokenRefreshResult>;
+      refreshFn: () => Promise<ClientTokenRefreshResult>;
       refreshBufferMs?: number;
     },
   ) {