diff --git a/packages/adapters/src/executor.test.ts b/packages/adapters/src/executor.test.ts
index 444f6de..38ce1f7 100644
--- a/packages/adapters/src/executor.test.ts
+++ b/packages/adapters/src/executor.test.ts
@@ -7,14 +7,13 @@ import {
   createRunExecutor,
   createRunWorkspaceCheckpoint,
   loadCurrentTurnImages,
-  missingTurnImagesInstruction,
   runNotificationsEnabled,
   selectBuiltinToolsForRun,
-  settleSteeringAttachmentLoads,
-  threadContextForRun,
   toolCompletionAuditPayload,
   toolCompletionFromResult,
 } from "./executor.js";
+import { missingTurnImagesInstruction, settleSteeringAttachmentLoads } from "./executor-attachments.js";
+import { threadContextForRun } from "./executor-completion.js";
 import { serializeModelSecret } from "./pi-oauth.js";
 
 describe("tool completion audit", () => {
diff --git a/packages/adapters/src/index.ts b/packages/adapters/src/index.ts
index 8a920e1..d570413 100644
--- a/packages/adapters/src/index.ts
+++ b/packages/adapters/src/index.ts
@@ -91,7 +91,6 @@ export * from "./pi-oauth.js";
 export * from "./pi-openai-compatible-provider.js";
 export * from "./pi-runtime.js";
 export * from "./pi-session.js";
-export * from "./pi-tool-utils.js";
 export * from "./pipedream-connector.js";
 export * from "./realtime.js";
 export * from "./release-watch.js";
diff --git a/packages/adapters/src/pi-runtime.ts b/packages/adapters/src/pi-runtime.ts
index 4f40fab..e4a6068 100644
--- a/packages/adapters/src/pi-runtime.ts
+++ b/packages/adapters/src/pi-runtime.ts
@@ -550,12 +550,3 @@ export {
   ToolCallBudget,
   ToolHost,
 } from "./pi-model-config.js";
-export {
-  toAgentTools,
-  normalizeAgentToolName,
-  describeToolActivity,
-  normalizeAgentToolNames,
-  toAgentTool,
-  executeSubagent,
-  parametersFor,
-} from "./pi-tool-utils.js";