feat: implement Phase 4 & 5 - integration and testing

Phase 4 - Build Configuration System:
- Integrated modular shell system with main entry point (src/index.ts)
- Modified main() to call loadShells() on startup using getBuildConfig()
- Updated getEnabledShells() to use registry with backward compatibility
- Added build scripts to package.json for different presets (full, windows, unix, gitbash-only, cmd-only, powershell-only)
- Added cross-env dependency for cross-platform environment variable support

Phase 5 - Testing & Validation:
- Fixed TypeScript errors in test files (mockImplementation() calls and spread operator type annotations)
- Created comprehensive integration test suite (tests/integration/modularShellSystem.test.ts)
- Integration tests cover: shell loading, registry integration, dynamic tool schemas, build configuration workflows, error handling
- All 680 tests passing (67 test suites)

Key Implementation Details:
- getEnabledShells() now returns intersection of configured shells and loaded shells from registry
- Backward compatibility: if registry is empty, returns all configured shells (for existing tests)
- Dynamic tool schemas automatically reflect shells loaded in registry
- Build presets enable customized builds with specific shell combinations

Author: claude

package-lock.json

@@ -36,6 +36,12 @@
   "scripts": {
     "clean": "shx rm -rf dist",
     "build": "tsc && shx chmod +x dist/index.js",
+    "build:full": "cross-env SHELL_BUILD_PRESET=full npm run build",
+    "build:windows": "cross-env SHELL_BUILD_PRESET=windows npm run build",
+    "build:unix": "cross-env SHELL_BUILD_PRESET=unix npm run build",
+    "build:gitbash": "cross-env SHELL_BUILD_PRESET=gitbash-only npm run build",
+    "build:cmd": "cross-env SHELL_BUILD_PRESET=cmd-only npm run build",
+    "build:powershell": "cross-env SHELL_BUILD_PRESET=powershell-only npm run build",
     "prepare": "npm run build",
     "watch": "tsc --watch",
     "start": "node dist/index.js",
@@ -60,6 +66,7 @@
     "@types/jest": "^29.5.14",
     "@types/node": "^20.11.0",
     "@types/yargs": "^17.0.33",
+    "cross-env": "^7.0.3",
     "jest": "^29.7.0",
     "shx": "^0.3.4",
     "ts-jest": "^29.3.4",

package.json

@@ -103,7 +103,7 @@ describe('Build Configuration', () => {
     it('should warn for unknown preset and use default', () => {
       process.env.SHELL_BUILD_PRESET = 'unknown-preset';
 
-      const consoleSpy = jest.spyOn(console, 'warn').mockImplementation();
+      const consoleSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
 
       const config = getBuildConfig();
 

src/build/__tests__/shell-config.test.ts

@@ -10,7 +10,7 @@ class MockShellA implements ShellPlugin {
   validateCommand = jest.fn(() => ({ valid: true }));
   validatePath = jest.fn(() => ({ valid: true }));
   getBlockedCommands = jest.fn(() => []);
-  mergeConfig = jest.fn((base, override) => ({ ...base, ...override }));
+  mergeConfig = jest.fn((base: ShellConfig, override: Partial<ShellConfig>) => ({ ...base, ...override } as ShellConfig));
 }
 
 class MockShellB implements ShellPlugin {
@@ -20,7 +20,7 @@ class MockShellB implements ShellPlugin {
   validateCommand = jest.fn(() => ({ valid: true }));
   validatePath = jest.fn(() => ({ valid: true }));
   getBlockedCommands = jest.fn(() => []);
-  mergeConfig = jest.fn((base, override) => ({ ...base, ...override }));
+  mergeConfig = jest.fn((base: ShellConfig, override: Partial<ShellConfig>) => ({ ...base, ...override } as ShellConfig));
 }
 
 describe('ShellRegistry', () => {
@@ -53,7 +53,7 @@ describe('ShellRegistry', () => {
       const shell1 = new MockShellA();
       const shell2 = new MockShellA();
 
-      const consoleSpy = jest.spyOn(console, 'warn').mockImplementation();
+      const consoleSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
 
       registry.register(shell1);
       registry.register(shell2);
@@ -79,7 +79,7 @@ describe('ShellRegistry', () => {
     });
 
     it('should log when registering shell', () => {
-      const consoleSpy = jest.spyOn(console, 'log').mockImplementation();
+      const consoleSpy = jest.spyOn(console, 'log').mockImplementation(() => {});
       const shell = new MockShellA();
 
       registry.register(shell);

src/core/__tests__/registry.test.ts

@@ -42,6 +42,10 @@ import { setDebugLogging, debugLog, debugWarn, errorLog } from './utils/log.js';
 import { truncateOutput, formatTruncatedOutput } from './utils/truncation.js';
 import { LogStorageManager } from './utils/logStorage.js';
 import { LogResourceHandler } from './utils/logResourceHandler.js';
+// Import modular shell system
+import { loadShells } from './shells/loader.js';
+import { shellRegistry } from './core/registry.js';
+import { getBuildConfig } from './build/shell-config.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -236,7 +240,18 @@ class CLIServer {
   }
 
   private getEnabledShells(): string[] {
-    return Array.from(this.resolvedConfigs.keys());
+    // Return shells that are both loaded in the registry AND enabled in config
+    const configShells = Array.from(this.resolvedConfigs.keys());
+    const loadedShells = shellRegistry.getShellTypes();
+
+    // If registry is empty, return all config shells (backward compatibility)
+    // Once fully migrated, this will enforce that shells must be in registry
+    if (loadedShells.length === 0) {
+      return configShells;
+    }
+
+    // Intersection: shells that are in both lists
+    return configShells.filter(shell => loadedShells.includes(shell));
   }
 
   private validateSingleCommand(context: ValidationContext, command: string): void {
@@ -1096,7 +1111,15 @@ const main = async () => {
 
     // Set debug logging based on CLI argument
     setDebugLogging(Boolean(args.debug));
-    
+
+    // Initialize modular shell system
+    const buildConfig = getBuildConfig();
+    await loadShells({
+      shells: buildConfig.includedShells,
+      verbose: buildConfig.verbose || Boolean(args.debug)
+    });
+    debugLog(`Loaded ${shellRegistry.getCount()} shell modules: ${shellRegistry.getShellTypes().join(', ')}`);
+
     // Handle --init-config flag
     if (args['init-config']) {
       try {

src/index.ts

@@ -43,7 +43,7 @@ describe('Shell Loader', () => {
   });
 
   it('should handle invalid shell types gracefully', async () => {
-    const consoleSpy = jest.spyOn(console, 'warn').mockImplementation();
+    const consoleSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
 
     await loadShells({
       shells: ['gitbash', 'invalid-shell', 'powershell'],
@@ -128,7 +128,7 @@ describe('Shell Loader', () => {
   });
 
   it('should support verbose mode', async () => {
-    const consoleSpy = jest.spyOn(console, 'log').mockImplementation();
+    const consoleSpy = jest.spyOn(console, 'log').mockImplementation(() => {});
 
     await loadShells({
       shells: ['gitbash'],
@@ -143,7 +143,7 @@ describe('Shell Loader', () => {
   });
 
   it('should handle loading errors gracefully', async () => {
-    const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation();
+    const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
 
     // This should not throw even if there's an error
     await loadShells({