refactor: rename and reorganize files

Author: chriscarrollsmith

README.md

@@ -292,13 +292,14 @@ All operations return a status code and message in their response:
 
 ```
 src/
-├── index.ts              # Main entry point
-├── cli.ts                # CLI for task approval and listing
+├── index.ts                   # Main entry point
+├── client/
+│   └── cli.ts                 # CLI for user task review and approval
 ├── server/
-│   └── TaskManagerServer.ts   # Core server functionality
+│   ├── TaskManager.ts         # Core service functionality
+│   └── tools.ts               # MCP tool definitions
 └── types/
-    ├── index.ts          # Type definitions and schemas
-    └── tools.ts          # MCP tool definitions
+    └── index.ts               # Type definitions and schemas
 ```
 
 ## Data Schema and Storage

index.ts

@@ -2,8 +2,8 @@
 
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
-import { TaskManagerServer } from "./src/server/TaskManagerServer.js";
-import { ALL_TOOLS } from "./src/types/tools.js";
+import { TaskManager } from "./src/server/TaskManager.js";
+import { ALL_TOOLS } from "./src/server/tools.js";
 import { ListToolsRequestSchema, CallToolRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 
 // Create server with capabilities BEFORE setting up handlers
@@ -29,7 +29,7 @@ console.error('Server starting with env:', {
 });
 
 // Initialize task manager
-const taskManager = new TaskManagerServer();
+const taskManager = new TaskManager();
 
 // Set up request handlers AFTER capabilities are configured
 server.setRequestHandler(ListToolsRequestSchema, async () => {

src/cli.ts renamed to src/client/cli.ts

@@ -4,7 +4,7 @@ import { Command } from "commander";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import * as os from "node:os";
-import { TaskManagerFile } from "./types/index.js";
+import { TaskManagerFile } from "../types/index.js";
 import chalk from "chalk";
 
 const program = new Command();

src/server/TaskManagerServer.ts renamed to src/server/TaskManager.ts

@@ -25,7 +25,7 @@ const getAppDataDir = () => {
 const DEFAULT_PATH = path.join(getAppDataDir(), "tasks.json");
 const TASK_FILE_PATH = process.env.TASK_MANAGER_FILE_PATH || DEFAULT_PATH;
 
-export class TaskManagerServer {
+export class TaskManager {
   private projectCounter = 0;
   private taskCounter = 0;
   private data: TaskManagerFile = { projects: [] };

src/types/tools.ts renamed to src/server/tools.ts

@@ -5,7 +5,7 @@ import * as os from "node:os";
 import { promisify } from "util";
 
 const execAsync = promisify(exec);
-const CLI_PATH = path.resolve(process.cwd(), "src/cli.ts");
+const CLI_PATH = path.resolve(process.cwd(), "src/client/cli.ts");
 
 describe("CLI Integration Tests", () => {
   let tempDir: string;

tests/integration/cli.test.ts

@@ -1,12 +1,12 @@
-import { ALL_TOOLS } from '../../src/types/tools.js';
-import { TaskManagerServer } from '../../src/server/TaskManagerServer.js';
+import { ALL_TOOLS } from '../../src/server/tools.js';
+import { TaskManager } from '../../src/server/TaskManager.js';
 import * as os from 'node:os';
 import * as path from 'node:path';
 import * as fs from 'node:fs/promises';
 import { Task } from '../../src/types/index.js';
 
-describe('TaskManagerServer Integration', () => {
-  let server: TaskManagerServer;
+describe('TaskManager Integration', () => {
+  let server: TaskManager;
   let tempDir: string;
   let testFilePath: string;
 
@@ -17,7 +17,7 @@ describe('TaskManagerServer Integration', () => {
     testFilePath = path.join(tempDir, 'test-tasks.json');
 
     // Initialize the server with the test file path
-    server = new TaskManagerServer(testFilePath);
+    server = new TaskManager(testFilePath);
   });
 
   afterEach(async () => {
@@ -484,7 +484,7 @@ describe('TaskManagerServer Integration', () => {
     ]);
 
     // Create a new server instance pointing to the same file
-    const newServer = new TaskManagerServer(testFilePath);
+    const newServer = new TaskManager(testFilePath);
 
     // Verify the data was loaded correctly
     const result = await newServer.listProjects("open");
@@ -499,13 +499,13 @@ describe('TaskManagerServer Integration', () => {
     }
 
     // Create another server instance and verify the changes persisted
-    const thirdServer = new TaskManagerServer(testFilePath);
+    const thirdServer = new TaskManager(testFilePath);
     const pendingResult = await thirdServer.listTasks(project.projectId, "pending_approval");
     expect(pendingResult.tasks!.length).toBe(1);
   });
 
   it("should handle tool/rule recommendations end-to-end", async () => {
-    const server = new TaskManagerServer(testFilePath);
+    const server = new TaskManager(testFilePath);
 
     // Create a project with tasks that have recommendations
     const { projectId } = await server.createProject("Test Project", [

tests/integration/server.test.ts

@@ -1,22 +1,22 @@
 import { describe, it, expect } from '@jest/globals';
-import { ALL_TOOLS } from '../../src/types/tools.js';
+import { ALL_TOOLS } from '../../src/server/tools.js';
 import { VALID_STATUS_TRANSITIONS, Task } from '../../src/types/index.js';
-import { TaskManagerServer } from '../../src/server/TaskManagerServer.js';
+import { TaskManager } from '../../src/server/TaskManager.js';
 import { mockTaskManagerData } from '../helpers/mocks.js';
 import * as os from 'node:os';
 import * as path from 'node:path';
 import * as fs from 'node:fs/promises';
 
-describe('TaskManagerServer', () => {
-  let server: TaskManagerServer;
+describe('TaskManager', () => {
+  let server: TaskManager;
   let tempDir: string;
   let tasksFilePath: string;
 
   beforeEach(async () => {
     tempDir = path.join(os.tmpdir(), `task-manager-test-${Date.now()}`);
     await fs.mkdir(tempDir, { recursive: true });
     tasksFilePath = path.join(tempDir, "test-tasks.json");
-    server = new TaskManagerServer(tasksFilePath);
+    server = new TaskManager(tasksFilePath);
   });
 
   afterEach(async () => {

tests/unit/TaskManagerServer.test.ts

@@ -1,5 +1,5 @@
 import { jest, describe, it, expect } from '@jest/globals';
-import { ALL_TOOLS } from '../../src/types/tools.js';
+import { ALL_TOOLS } from '../../src/server/tools.js';
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
 
 interface SchemaProperty {