diff --git a/packages/core/src/session/inbox.ts b/packages/core/src/session/inbox.ts
index f73e481a122..31cd11f95d0 100644
--- a/packages/core/src/session/inbox.ts
+++ b/packages/core/src/session/inbox.ts
@@ -75,8 +75,8 @@ function matches<Type extends Item["type"]>(
 
 const fromRow = (row: typeof SessionInboxTable.$inferSelect): Info => {
   const base = {
-    id: SessionMessage.ID.make(row.id),
-    sessionID: SessionSchema.ID.make(row.session_id),
+    id: row.id,
+    sessionID: row.session_id,
     time: { created: DateTime.makeUnsafe(row.time_created) },
   }
   if (row.type === "compaction")
@@ -230,7 +230,7 @@ export const make = Effect.fn("SessionInbox.make")(function* () {
         return yield* admit({
           id: input.id,
           sessionID: input.sessionID,
-          item: { type: "compaction", payload: {}, delivery: Delivery.make(input.delivery) },
+          item: { type: "compaction", payload: {}, delivery: input.delivery },
         })
       }),
     )
@@ -473,17 +473,17 @@ const publish = Effect.fn("SessionInbox.publish")(function* (
   yield* Effect.forEach(
     rows,
     (row) => {
-      const entry = fromRow(row)
-      if (entry.type === "compaction") return Effect.die(new LifecycleConflict({ id: entry.id }))
+      if (row.type !== "move" && row.type !== "user" && row.type !== "synthetic")
+        return Effect.die(new LifecycleConflict({ id: row.id }))
       return bus
         .publish(SessionEvent.InboxDelivered, {
           sessionID,
-          inboxID: entry.id,
+          inboxID: row.id,
         })
         .pipe(
           Effect.catchDefect((defect) =>
             defect instanceof LifecycleConflict
-              ? promotedFromMessage(db, sessionID, entry.id, entry.delivery).pipe(
+              ? promotedFromMessage(db, sessionID, row.id, row.delivery).pipe(
                   Effect.flatMap((stored) => (stored !== undefined ? Effect.void : Effect.die(defect))),
                   Effect.orDie,
                 )
diff --git a/packages/core/src/session/message-updater.ts b/packages/core/src/session/message-updater.ts
index 8913b1a87ed..24d9ce35280 100644
--- a/packages/core/src/session/message-updater.ts
+++ b/packages/core/src/session/message-updater.ts
@@ -19,6 +19,8 @@ export interface Adapter {
 
 type DraftAssistant = WritableDraft<SessionMessage.Assistant>
 
+const decodeAssistantContent = Schema.decodeUnknownSync(Schema.Array(SessionMessage.AssistantContent))
+
 const projectTerminalSnapshot = (draft: DraftAssistant, event: SessionEvent.Step.Ended | SessionEvent.Step.Failed) => {
   if (event.data.snapshot || event.data.files)
     draft.snapshot = {
@@ -85,9 +87,7 @@ export function update(adapter: Adapter, event: SessionEvent.DurableEvent) {
       "session.unarchived": () => Effect.void,
       "session.message.content.updated": (event) =>
         updateOwnedAssistant(event.data.messageID, (draft) => {
-          draft.content = castDraft(
-            Schema.decodeUnknownSync(Schema.Array(SessionMessage.AssistantContent))(event.data.content),
-          )
+          draft.content = castDraft(decodeAssistantContent(event.data.content))
         }),
       "session.usage.recorded": () => Effect.void,
       "session.agent.selected": (event) =>
diff --git a/packages/core/src/session/prompt.ts b/packages/core/src/session/prompt.ts
index 80878f354dd..d721a7454ed 100644
--- a/packages/core/src/session/prompt.ts
+++ b/packages/core/src/session/prompt.ts
@@ -1,6 +1,6 @@
 export * as SessionPrompt from "./prompt.js"
 
-import { Base64, FileAttachment, Prompt } from "@opencode/schema/prompt"
+import { Base64, FileAttachment } from "@opencode/schema/prompt"
 import { PromptInput } from "@opencode/schema/prompt-input"
 import { SessionInbox } from "@opencode/schema/session-inbox"
 import type { Session } from "@opencode/schema/session"
@@ -77,15 +77,13 @@ export const prepare = Effect.fn("SessionPrompt.prepare")(function* (request: {
     return {
       type: "user",
       payload: SessionInbox.UserPayload.make({
-        ...Prompt.make({
-          text: input.text,
-          agents: input.agents,
-          files,
-          skills: selected?.length ? selected : undefined,
-        }),
+        text: input.text,
+        agents: input.agents,
+        files,
+        skills: selected?.length ? selected : undefined,
         metadata: event.metadata,
       }),
-      delivery: SessionInbox.Delivery.make(event.delivery),
+      delivery: event.delivery,
     } satisfies SessionInbox.Item
   }).pipe(instances.provide(request.session))
 })