diff --git a/packages/adapters/src/executor.ts b/packages/adapters/src/executor.ts
index d0380e0..d9405c8 100644
--- a/packages/adapters/src/executor.ts
+++ b/packages/adapters/src/executor.ts
@@ -25,7 +25,8 @@ import {
   routineWakeupJob,
   runContinueJob,
 } from "@rakazo/adapter-kit";
-import type { MessageBlock, RunStatus } from "@rakazo/contracts";
+import type { RunStatus } from "@rakazo/contracts";
+import { type MessageBlock, MessageBlock as MessageBlockSchema } from "@rakazo/contracts";
 import {
   ATTACHMENT_MAX_BYTES,
   BOT_DESCRIPTION_MAX_LENGTH,
@@ -1312,11 +1313,11 @@ export function createRunExecutor(deps: ExecutorDeps) {
             },
           });
           if (!source) return undefined;
-          const parsed = MessageBlock.array().safeParse(source.blocks);
+          const parsed = MessageBlockSchema.array().safeParse(source.blocks);
           if (!parsed.success) return undefined;
           const handoff = inboundHandoffForBot(parsed.data, bot.id);
           if (!handoff) return undefined;
-          return renderInboundHandoffWorkshopInstruction(handoff, source.bot?.name);
+          return renderInboundHandoffWorkshopInstruction(handoff, (source.bot as { name?: string } | null)?.name);
         })();
         const hasMessagingIdentity = deps.messaging
           ? await deps.messaging.hasIdentity(bot.id)
@@ -1973,7 +1974,7 @@ export function createRunExecutor(deps: ExecutorDeps) {
           };
 
           if (applied?.duplicate) {
-            const gate = resolveDuplicateEffectGate(applied.effect, name);
+            const gate = resolveDuplicateEffectGate(applied.effect as any, name);
             if (gate.action === "return") {
               if (name === "request_secret") {
                 const replacementSecret = await deps.prisma.secret.findFirst({
@@ -2832,7 +2833,7 @@ export function createRunExecutor(deps: ExecutorDeps) {
               }
               const recordedEffect = await recordEffect(deps, run, name, effectKey, args);
               if (recordedEffect?.duplicate) {
-                const gate = resolveDuplicateEffectGate(recordedEffect.effect, name);
+                const gate = resolveDuplicateEffectGate(recordedEffect.effect as any, name);
                 if (gate.action === "execute") {
                   const early = await claimOrReturn("approved");
                   if (early !== undefined) return early;
@@ -2887,7 +2888,7 @@ export function createRunExecutor(deps: ExecutorDeps) {
               });
             }
             const recordedForAsk = await recordEffect(deps, run, name, effectKey, args);
-            const missingSecretAction = resolveMissingRunSecretAction(recordedForAsk.effect);
+            const missingSecretAction = resolveMissingRunSecretAction(recordedForAsk.effect as any);
             if (missingSecretAction.action === "return") return missingSecretAction.result;
             const connectionId = args.connectionId ? String(args.connectionId) : undefined;
             if (connectionId) {
diff --git a/packages/adapters/src/prose-handoff-recovery.ts b/packages/adapters/src/prose-handoff-recovery.ts
index 2fbea25..462963e 100644
--- a/packages/adapters/src/prose-handoff-recovery.ts
+++ b/packages/adapters/src/prose-handoff-recovery.ts
@@ -62,8 +62,8 @@ export async function tryRecoverProseHandoff(
     };
   }
 
-  let nextHandedOff = handedOff;
-  let blockedUpward = false;
+  let nextHandedOff: boolean = handedOff;
+  let blockedUpward: boolean = false;
   for (const call of sanitized.proseToolCalls) {
     if (call.name !== "handoff_to_bot") continue;
     const args = proseHandoffArgs(call);