diff --git a/src/features/hook-message-injector/constants.ts b/src/features/hook-message-injector/constants.ts
index 0424b96cf..97e228ece 100644
--- a/src/features/hook-message-injector/constants.ts
+++ b/src/features/hook-message-injector/constants.ts
@@ -1 +1 @@
-export { OPENCODE_STORAGE, MESSAGE_STORAGE, PART_STORAGE } from "../../shared"
+export { OPENCODE_STORAGE, MESSAGE_STORAGE, PART_STORAGE } from "../../shared/opencode-storage-paths"
diff --git a/src/features/hook-message-injector/injector.ts b/src/features/hook-message-injector/injector.ts
index b9a8a7590..2ecc9c4d9 100644
--- a/src/features/hook-message-injector/injector.ts
+++ b/src/features/hook-message-injector/injector.ts
@@ -6,7 +6,8 @@ import { MESSAGE_STORAGE, PART_STORAGE } from "./constants"
 import type { MessageMeta, OriginalMessageContext, TextPart, ToolPermission } from "./types"
 import { log } from "../../shared/logger"
 import { isSqliteBackend } from "../../shared/opencode-storage-detection"
-import { createInternalAgentTextPart, normalizeSDKResponse } from "../../shared"
+import { createInternalAgentTextPart } from "../../shared/internal-initiator-marker"
+import { normalizeSDKResponse } from "../../shared/normalize-sdk-response"
 import { hasCompactionPartInStorage, isCompactionMessage } from "../../shared/compaction-marker"
 
 export interface StoredMessage {