refactor: move services and tests to their own folders

server/src/modules/llm/llm.routes.ts

@@ -5,13 +5,13 @@ import path from 'node:path';
 import { asyncHandler } from '@/shared/http/async-handler.js';
 import { AppError } from '@/shared/utils/app-error.js';
 import { createApiErrorResponse, createApiSuccessResponse } from '@/shared/http/api-response.js';
-import { llmService } from '@/modules/llm/llm.service.js';
-import { llmSessionsService } from '@/modules/llm/sessions.service.js';
-import { llmAssetsService } from '@/modules/llm/assets.service.js';
-import type { McpScope, McpTransport, UpsertMcpServerInput } from '@/modules/llm/mcp.service.js';
-import { llmMcpService } from '@/modules/llm/mcp.service.js';
-import { llmSkillsService } from '@/modules/llm/skills.service.js';
-import { llmMessagesUnifier } from '@/modules/llm/messages-unifier.service.js';
+import { llmService } from '@/modules/llm/services/llm.service.js';
+import { llmSessionsService } from '@/modules/llm/services/sessions.service.js';
+import { llmAssetsService } from '@/modules/llm/services/assets.service.js';
+import type { McpScope, McpTransport, UpsertMcpServerInput } from '@/modules/llm/services/mcp.service.js';
+import { llmMcpService } from '@/modules/llm/services/mcp.service.js';
+import { llmSkillsService } from '@/modules/llm/services/skills.service.js';
+import { llmMessagesUnifier } from '@/modules/llm/services/messages-unifier.service.js';
 import type { LLMProvider } from '@/shared/types/app.js';
 import { logger } from '@/shared/utils/logger.js';
 

server/src/modules/llm/services/sessions-watcher.service.ts

@@ -3,7 +3,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { promises as fsPromises } from 'node:fs';
 
-import { llmSessionsService } from '@/modules/llm/sessions.service.js';
+import { llmSessionsService } from '@/modules/llm/services/sessions.service.js';
 import type { LLMProvider } from '@/shared/types/app.js';
 import { logger } from '@/shared/utils/logger.js';
 

server/src/modules/llm/services/sessions.service.ts

@@ -6,7 +6,7 @@ import { sessionsDb } from '@/shared/database/repositories/sessions.db.js';
 import type { LLMProvider } from '@/shared/types/app.js';
 import { AppError } from '@/shared/utils/app-error.js';
 import { sessionIndexers } from '@/modules/llm/session-indexers/index.js';
-import { llmMessagesUnifier, type UnifiedChatMessage } from '@/modules/llm/messages-unifier.service.js';
+import { llmMessagesUnifier, type UnifiedChatMessage } from '@/modules/llm/services/messages-unifier.service.js';
 
 type SyncResult = {
   processedByProvider: Record<LLMProvider, number>;

server/src/modules/llm/tests/llm-unifier.images.test.ts

@@ -4,13 +4,13 @@ import os from 'node:os';
 import path from 'node:path';
 import test from 'node:test';
 
-import { AppError } from '../../shared/utils/app-error.js';
-import { llmAssetsService } from './assets.service.js';
-import { ClaudeProvider } from './providers/claude.provider.js';
-import { CodexProvider } from './providers/codex.provider.js';
-import { CursorProvider } from './providers/cursor.provider.js';
-import { GeminiProvider } from './providers/gemini.provider.js';
-import { llmService } from './llm.service.js';
+import { AppError } from '@/shared/utils/app-error.js';
+import { llmAssetsService } from '@/modules/llm/services/assets.service.js';
+import { ClaudeProvider } from '@/modules/llm/providers/claude.provider.js';
+import { CodexProvider } from '@/modules/llm/providers/codex.provider.js';
+import { CursorProvider } from '@/modules/llm/providers/cursor.provider.js';
+import { GeminiProvider } from '@/modules/llm/providers/gemini.provider.js';
+import { llmService } from '@/modules/llm/services/llm.service.js';
 
 const asyncEvents = async function* (events: unknown[]) {
   for (const event of events) {

server/src/modules/llm/tests/llm-unifier.mcp.test.ts

@@ -7,8 +7,8 @@ import test from 'node:test';
 
 import TOML from '@iarna/toml';
 
-import { AppError } from '../../shared/utils/app-error.js';
-import { llmMcpService } from './mcp.service.js';
+import { AppError } from '@/shared/utils/app-error.js';
+import { llmMcpService } from '@/modules/llm/services/mcp.service.js';
 
 const patchHomeDir = (nextHomeDir: string) => {
   const original = os.homedir;

server/src/modules/llm/tests/llm-unifier.messages.test.ts

@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
 
-import { llmMessagesUnifier } from './messages-unifier.service.js';
+import { llmMessagesUnifier } from '@/modules/llm/services/messages-unifier.service.js';
 
 /**
  * This test covers helper-3 Claude normalization: user/assistant/thinking/tool-use/tool-result/error.

server/src/modules/llm/tests/llm-unifier.providers.test.ts

@@ -4,12 +4,12 @@ import os from 'node:os';
 import path from 'node:path';
 import test from 'node:test';
 
-import { AppError } from '../../shared/utils/app-error.js';
-import { llmService } from './llm.service.js';
-import { CursorProvider } from './providers/cursor.provider.js';
-import { GeminiProvider } from './providers/gemini.provider.js';
-import { CodexProvider } from './providers/codex.provider.js';
-import { ClaudeProvider } from './providers/claude.provider.js';
+import { AppError } from '@/shared/utils/app-error.js';
+import { llmService } from '@/modules/llm/services/llm.service.js';
+import { CursorProvider } from '@/modules/llm/providers/cursor.provider.js';
+import { GeminiProvider } from '@/modules/llm/providers/gemini.provider.js';
+import { CodexProvider } from '@/modules/llm/providers/codex.provider.js';
+import { ClaudeProvider } from '@/modules/llm/providers/claude.provider.js';
 
 const asyncEvents = async function* (events: unknown[]) {
   for (const event of events) {

server/src/modules/llm/tests/llm-unifier.sessions.test.ts

@@ -4,13 +4,13 @@ import os from 'node:os';
 import path from 'node:path';
 import test from 'node:test';
 
-import { AppError } from '../../shared/utils/app-error.js';
-import { scanStateDb } from '../../shared/database/repositories/scan-state.db.js';
-import { sessionsDb } from '../../shared/database/repositories/sessions.db.js';
-import { llmSessionsService } from './sessions.service.js';
-import { sessionIndexers } from './session-indexers/index.js';
-import { conversationSearchService } from '../conversations/conversation-search.service.js';
-import type { ISessionIndexer } from './session-indexers/session-indexer.interface.js';
+import { AppError } from '@/shared/utils/app-error.js';
+import { scanStateDb } from '@/shared/database/repositories/scan-state.db.js';
+import { sessionsDb } from '@/shared/database/repositories/sessions.db.js';
+import { llmSessionsService } from '@/modules/llm/services/sessions.service.js';
+import { sessionIndexers } from '@/modules/llm/session-indexers/index.js';
+import { conversationSearchService } from '@/modules/conversations/conversation-search.service.js';
+import type { ISessionIndexer } from '@/modules/llm/session-indexers/session-indexer.interface.js';
 
 const patchMethod = <T extends object, K extends keyof T>(target: T, key: K, replacement: T[K]) => {
   const original = target[key];

server/src/modules/llm/tests/llm-unifier.skills.test.ts

@@ -4,7 +4,7 @@ import os from 'node:os';
 import path from 'node:path';
 import test from 'node:test';
 
-import { llmSkillsService } from './skills.service.js';
+import { llmSkillsService } from '@/modules/llm/services/skills.service.js';
 
 const patchHomeDir = (nextHomeDir: string) => {
   const original = os.homedir;

server/src/modules/workspaces/workspaces.service.ts

@@ -1,6 +1,6 @@
 import path from 'node:path';
 
-import { llmSessionsService } from '@/modules/llm/sessions.service.js';
+import { llmSessionsService } from '@/modules/llm/services/sessions.service.js';
 import { sessionsDb } from '@/shared/database/repositories/sessions.db.js';
 import { workspaceOriginalPathsDb } from '@/shared/database/repositories/workspace-original-paths.db.js';
 import type { SessionsRow } from '@/shared/database/types.js';

server/src/runner.ts

@@ -8,7 +8,7 @@ import { dirname } from 'path';
 import { fileURLToPath } from 'url';
 
 import { initializeDatabase } from '@/shared/database/init-db.js';
-import { initializeWatcher } from '@/modules/llm/sessions.watcher.js';
+import { initializeWatcher } from '@/modules/llm/services/sessions-watcher.service.js';
 import { configureWebPush } from '@/modules/push-sub/push-sub.services.js';
 import { getConnectableHost } from '@/shared/utils/networkHosts.js';
 import { logger } from '@/shared/utils/logger.js';