diff --git a/src/main/orchestration/turn-context.ts b/src/main/orchestration/turn-context.ts
index c5ad0747..22fe7a1f 100644
--- a/src/main/orchestration/turn-context.ts
+++ b/src/main/orchestration/turn-context.ts
@@ -6,7 +6,7 @@
  * prompt) is an isolated helper, making the pipeline testable and extensible.
  */
 
-import { buildTaskPrompt } from "../prompt-builder";
+import { buildTaskPrompt } from "../prompt-builder/index";
 import type { AppDatabase } from "../database";
 import type { ProjectedSkill } from "../skill-types";
 import type { ConnectorId, ExecutionMode } from "@shared/types";
diff --git a/src/main/prompt-builder.ts b/src/main/prompt-builder.ts
deleted file mode 100644
index b875e7f8..00000000
--- a/src/main/prompt-builder.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { buildTaskPrompt } from "./prompt-builder/index";
-export { buildSystemPrompt } from "./prompt-builder/system-prompt";
diff --git a/src/main/prompt-builder/index.ts b/src/main/prompt-builder/index.ts
index 14aa1bdb..929bfb38 100644
--- a/src/main/prompt-builder/index.ts
+++ b/src/main/prompt-builder/index.ts
@@ -5,6 +5,8 @@ import { buildSystemPrompt } from "./system-prompt";
 import { renderWakeReason } from "./wake-reasons";
 import { getSystemMessages } from "./messages";
 
+export { buildSystemPrompt } from "./system-prompt";
+
 export interface PromptContext {
   agent: AgentRecord;
   apiUrl: string;
diff --git a/tests/integration/autonomous-chain/ceo-phased-prompts.spec.ts b/tests/integration/autonomous-chain/ceo-phased-prompts.spec.ts
index 9835f6ab..307a80e9 100644
--- a/tests/integration/autonomous-chain/ceo-phased-prompts.spec.ts
+++ b/tests/integration/autonomous-chain/ceo-phased-prompts.spec.ts
@@ -4,7 +4,7 @@
  */
 
 import { describe, expect, it } from "vitest";
-import { buildSystemPrompt } from "../../../src/main/prompt-builder";
+import { buildSystemPrompt } from "../../../src/main/prompt-builder/index";
 import type { ApprovalRecord } from "../../../src/shared/types";
 import { installSharedSetup } from "./shared-setup";
 
diff --git a/tests/integration/autonomous-chain/e2e-flows.spec.ts b/tests/integration/autonomous-chain/e2e-flows.spec.ts
index c3c87998..1b44fbd5 100644
--- a/tests/integration/autonomous-chain/e2e-flows.spec.ts
+++ b/tests/integration/autonomous-chain/e2e-flows.spec.ts
@@ -4,7 +4,7 @@
  */
 
 import { describe, expect, it } from "vitest";
-import { buildSystemPrompt, buildTaskPrompt } from "../../../src/main/prompt-builder";
+import { buildSystemPrompt, buildTaskPrompt } from "../../../src/main/prompt-builder/index";
 import type { ApprovalRecord } from "../../../src/shared/types";
 import { installSharedSetup } from "./shared-setup";
 
diff --git a/tests/integration/autonomous-chain/role-detection.spec.ts b/tests/integration/autonomous-chain/role-detection.spec.ts
index 3acfb4b1..636ce555 100644
--- a/tests/integration/autonomous-chain/role-detection.spec.ts
+++ b/tests/integration/autonomous-chain/role-detection.spec.ts
@@ -4,7 +4,7 @@
  */
 
 import { describe, expect, it } from "vitest";
-import { buildSystemPrompt } from "../../../src/main/prompt-builder";
+import { buildSystemPrompt } from "../../../src/main/prompt-builder/index";
 import { installSharedSetup } from "./shared-setup";
 
 const shared = installSharedSetup();
diff --git a/tests/integration/autonomous-chain/shared-setup.ts b/tests/integration/autonomous-chain/shared-setup.ts
index 72d1abc3..013e307c 100644
--- a/tests/integration/autonomous-chain/shared-setup.ts
+++ b/tests/integration/autonomous-chain/shared-setup.ts
@@ -16,7 +16,7 @@ import { join } from "node:path";
 import { tmpdir } from "node:os";
 import { afterEach, beforeEach } from "vitest";
 import { AppDatabase } from "../../../src/main/database";
-import { buildSystemPrompt } from "../../../src/main/prompt-builder";
+import { buildSystemPrompt } from "../../../src/main/prompt-builder/index";
 import type { AgentRecord, ApprovalRecord, TaskRecord } from "../../../src/shared/types";
 
 export interface SharedContext {
diff --git a/tests/integration/autonomous-chain/wake-reason.spec.ts b/tests/integration/autonomous-chain/wake-reason.spec.ts
index 6167b785..205c28cc 100644
--- a/tests/integration/autonomous-chain/wake-reason.spec.ts
+++ b/tests/integration/autonomous-chain/wake-reason.spec.ts
@@ -4,7 +4,7 @@
  */
 
 import { describe, expect, it } from "vitest";
-import { buildTaskPrompt } from "../../../src/main/prompt-builder";
+import { buildTaskPrompt } from "../../../src/main/prompt-builder/index";
 import { installSharedSetup } from "./shared-setup";
 
 const shared = installSharedSetup();
diff --git a/tests/integration/skill-aware-assignment.spec.ts b/tests/integration/skill-aware-assignment.spec.ts
index 16cbe4d8..ea8f8303 100644
--- a/tests/integration/skill-aware-assignment.spec.ts
+++ b/tests/integration/skill-aware-assignment.spec.ts
@@ -4,7 +4,7 @@ import { tmpdir } from "node:os";
 import { afterEach, describe, expect, it } from "vitest";
 import { randomUUID } from "node:crypto";
 import { AppDatabase } from "../../src/main/database";
-import { buildTaskPrompt } from "../../src/main/prompt-builder";
+import { buildTaskPrompt } from "../../src/main/prompt-builder/index";
 
 const tempDirs: string[] = [];
 
diff --git a/tests/unit/prompt-manager-classification.test.ts b/tests/unit/prompt-manager-classification.test.ts
index b5e0cdaa..ff8affee 100644
--- a/tests/unit/prompt-manager-classification.test.ts
+++ b/tests/unit/prompt-manager-classification.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { buildSystemPrompt } from "../../src/main/prompt-builder";
+import { buildSystemPrompt } from "../../src/main/prompt-builder/index";
 import type { PromptContext } from "../../src/main/prompt-builder/index";
 
 function buildCtx(overrides: Partial<PromptContext> = {}): PromptContext {