diff --git a/libs/dependency-resolver/src/index.ts b/libs/dependency-resolver/src/index.ts
index d9b7cf72..5f6d7259 100644
--- a/libs/dependency-resolver/src/index.ts
+++ b/libs/dependency-resolver/src/index.ts
@@ -8,4 +8,4 @@ export {
   areDependenciesSatisfied,
   getBlockingDependencies,
   type DependencyResolutionResult,
-} from './resolver';
+} from './resolver.js';
diff --git a/libs/git-utils/package.json b/libs/git-utils/package.json
index 35145fd0..83e93d47 100644
--- a/libs/git-utils/package.json
+++ b/libs/git-utils/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@automaker/git-utils",
   "version": "1.0.0",
+  "type": "module",
   "description": "Git operations utilities for AutoMaker",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/libs/git-utils/src/diff.ts b/libs/git-utils/src/diff.ts
index d41c3f34..dc777afb 100644
--- a/libs/git-utils/src/diff.ts
+++ b/libs/git-utils/src/diff.ts
@@ -7,8 +7,8 @@ import fs from "fs/promises";
 import path from "path";
 import { exec } from "child_process";
 import { promisify } from "util";
-import { BINARY_EXTENSIONS, type FileStatus } from './types';
-import { isGitRepo, parseGitStatus } from './status';
+import { BINARY_EXTENSIONS, type FileStatus } from './types.js';
+import { isGitRepo, parseGitStatus } from './status.js';
 
 const execAsync = promisify(exec);
 const logger = createLogger("GitUtils");
diff --git a/libs/git-utils/src/index.ts b/libs/git-utils/src/index.ts
index 6d7138b6..a29473e3 100644
--- a/libs/git-utils/src/index.ts
+++ b/libs/git-utils/src/index.ts
@@ -8,13 +8,13 @@ export {
   BINARY_EXTENSIONS,
   GIT_STATUS_MAP,
   type FileStatus,
-} from './types';
+} from './types.js';
 
 // Export status utilities
 export {
   isGitRepo,
   parseGitStatus,
-} from './status';
+} from './status.js';
 
 // Export diff utilities
 export {
@@ -23,4 +23,4 @@ export {
   listAllFilesInDirectory,
   generateDiffsForNonGitDirectory,
   getGitRepositoryDiffs,
-} from './diff';
+} from './diff.js';
diff --git a/libs/git-utils/src/status.ts b/libs/git-utils/src/status.ts
index 7055b883..df3bee4e 100644
--- a/libs/git-utils/src/status.ts
+++ b/libs/git-utils/src/status.ts
@@ -4,7 +4,7 @@
 
 import { exec } from "child_process";
 import { promisify } from "util";
-import { GIT_STATUS_MAP, type FileStatus } from './types';
+import { GIT_STATUS_MAP, type FileStatus } from './types.js';
 
 const execAsync = promisify(exec);
 
diff --git a/libs/git-utils/tsconfig.json b/libs/git-utils/tsconfig.json
index f677f8d5..b8cbad52 100644
--- a/libs/git-utils/tsconfig.json
+++ b/libs/git-utils/tsconfig.json
@@ -2,7 +2,9 @@
   "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./dist",
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext"
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]
diff --git a/libs/model-resolver/package.json b/libs/model-resolver/package.json
index 60434f47..b5dc08d3 100644
--- a/libs/model-resolver/package.json
+++ b/libs/model-resolver/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@automaker/model-resolver",
   "version": "1.0.0",
+  "type": "module",
   "description": "Model resolution utilities for AutoMaker",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/libs/model-resolver/src/index.ts b/libs/model-resolver/src/index.ts
index 22852e18..6a72f317 100644
--- a/libs/model-resolver/src/index.ts
+++ b/libs/model-resolver/src/index.ts
@@ -10,4 +10,4 @@ export { CLAUDE_MODEL_MAP, DEFAULT_MODELS, type ModelAlias } from '@automaker/ty
 export {
   resolveModelString,
   getEffectiveModel,
-} from './resolver';
+} from './resolver.js';
diff --git a/libs/model-resolver/tsconfig.json b/libs/model-resolver/tsconfig.json
index f677f8d5..b8cbad52 100644
--- a/libs/model-resolver/tsconfig.json
+++ b/libs/model-resolver/tsconfig.json
@@ -2,7 +2,9 @@
   "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./dist",
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext"
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]
diff --git a/libs/platform/package.json b/libs/platform/package.json
index e8f82a3a..d7cb2ec4 100644
--- a/libs/platform/package.json
+++ b/libs/platform/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@automaker/platform",
   "version": "1.0.0",
+  "type": "module",
   "description": "Platform-specific utilities for AutoMaker",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/libs/platform/src/index.ts b/libs/platform/src/index.ts
index 77fa28fe..94cb53d6 100644
--- a/libs/platform/src/index.ts
+++ b/libs/platform/src/index.ts
@@ -20,7 +20,7 @@ export {
   getCredentialsPath,
   getProjectSettingsPath,
   ensureDataDir,
-} from './paths';
+} from './paths.js';
 
 // Subprocess management
 export {
@@ -28,7 +28,7 @@ export {
   spawnProcess,
   type SubprocessOptions,
   type SubprocessResult,
-} from './subprocess';
+} from './subprocess.js';
 
 // Security
 export {
@@ -37,4 +37,4 @@ export {
   isPathAllowed,
   validatePath,
   getAllowedPaths,
-} from './security';
+} from './security.js';
diff --git a/libs/platform/tsconfig.json b/libs/platform/tsconfig.json
index f677f8d5..b8cbad52 100644
--- a/libs/platform/tsconfig.json
+++ b/libs/platform/tsconfig.json
@@ -2,7 +2,9 @@
   "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./dist",
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext"
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]
diff --git a/libs/utils/package.json b/libs/utils/package.json
index 6f1cd182..d682b99a 100644
--- a/libs/utils/package.json
+++ b/libs/utils/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@automaker/utils",
   "version": "1.0.0",
+  "type": "module",
   "description": "Shared utility functions for AutoMaker",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/libs/utils/src/index.ts b/libs/utils/src/index.ts
index 694b999b..3d360dbd 100644
--- a/libs/utils/src/index.ts
+++ b/libs/utils/src/index.ts
@@ -10,7 +10,7 @@ export {
   isAuthenticationError,
   classifyError,
   getUserFriendlyErrorMessage,
-} from './error-handler';
+} from './error-handler.js';
 
 // Conversation utilities
 export {
@@ -18,7 +18,7 @@ export {
   normalizeContentBlocks,
   formatHistoryAsText,
   convertHistoryToMessages,
-} from './conversation-utils';
+} from './conversation-utils.js';
 
 // Image handling
 export {
@@ -26,14 +26,14 @@ export {
   readImageAsBase64,
   convertImagesToContentBlocks,
   formatImagePathsForPrompt,
-} from './image-handler';
+} from './image-handler.js';
 
 // Prompt building
 export {
   buildPromptWithImages,
   type PromptContent,
   type PromptWithImages,
-} from './prompt-builder';
+} from './prompt-builder.js';
 
 // Logger
 export {
@@ -41,10 +41,10 @@ export {
   getLogLevel,
   setLogLevel,
   LogLevel,
-} from './logger';
+} from './logger.js';
 
 // File system utilities
 export {
   mkdirSafe,
   existsSafe,
-} from './fs-utils';
+} from './fs-utils.js';
diff --git a/libs/utils/src/prompt-builder.ts b/libs/utils/src/prompt-builder.ts
index ee0065fc..c6ce2e7d 100644
--- a/libs/utils/src/prompt-builder.ts
+++ b/libs/utils/src/prompt-builder.ts
@@ -8,7 +8,7 @@
  * - Supports both vision and non-vision models
  */
 
-import { convertImagesToContentBlocks, formatImagePathsForPrompt } from "./image-handler";
+import { convertImagesToContentBlocks, formatImagePathsForPrompt } from "./image-handler.js";
 
 /**
  * Content that can be either simple text or structured blocks
diff --git a/libs/utils/tsconfig.json b/libs/utils/tsconfig.json
index f677f8d5..b8cbad52 100644
--- a/libs/utils/tsconfig.json
+++ b/libs/utils/tsconfig.json
@@ -2,7 +2,9 @@
   "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./dist",
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext"
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]