diff --git a/apps/web/src/lib/bot-persona.ts b/apps/web/src/lib/bot-persona.ts
index 914af4b..db12e9c 100644
--- a/apps/web/src/lib/bot-persona.ts
+++ b/apps/web/src/lib/bot-persona.ts
@@ -1,4 +1,3 @@
-import { msg } from "@lingui/core/macro";
 import type { ThreadSnapshot } from "@rakazo/contracts";
 import { type EvooPose, mapPersonaArchetypeToIdlePose, mapVoicePhaseToPose } from "@rakazo/ui-web";
 import type { StagePresencePhase } from "../components/stage/StageHero";
@@ -464,7 +463,11 @@ function narrateWorking(archetype: PersonaArchetype, name: string): string {
     case "engineer":
       return `${name} is heads-down on this.`;
     default:
-      return i18n._(msg`${name} is working on your request.`);
+      return i18n._({
+        id: "{name} is working on your request.",
+        message: "{name} is working on your request.",
+        values: { name },
+      });
   }
 }
 
diff --git a/packages/adapters/src/executor-effect-idempotency.test.ts b/packages/adapters/src/executor-effect-idempotency.test.ts
index 9901102..9f356d1 100644
--- a/packages/adapters/src/executor-effect-idempotency.test.ts
+++ b/packages/adapters/src/executor-effect-idempotency.test.ts
@@ -139,10 +139,15 @@ function fixture(runId = "run-1") {
     userModelCredential: { findFirst: vi.fn(async () => null) },
     deploymentSettings: {
       findUnique: vi.fn(async () => ({
+        ownerUserId: null,
+        ownerGithubTokenCipher: null,
         defaultModelProvider: "scripted",
         defaultModelId: "scripted",
       })),
     },
+    space: {
+      findUnique: vi.fn(async () => ({ isDefault: true, gitDefaultBranch: "main" })),
+    },
     taughtSkill: { findMany: vi.fn(async () => []) },
     agentSecret: { findMany: vi.fn(async () => []) },
     user: { findUnique: vi.fn(async () => null) },
diff --git a/packages/adapters/src/executor-lease-poll.test.ts b/packages/adapters/src/executor-lease-poll.test.ts
index 7c4290a..6981726 100644
--- a/packages/adapters/src/executor-lease-poll.test.ts
+++ b/packages/adapters/src/executor-lease-poll.test.ts
@@ -108,10 +108,15 @@ function executorFixture() {
     userModelCredential: { findFirst: vi.fn(async () => null) },
     deploymentSettings: {
       findUnique: vi.fn(async () => ({
+        ownerUserId: null,
+        ownerGithubTokenCipher: null,
         defaultModelProvider: "scripted",
         defaultModelId: "scripted",
       })),
     },
+    space: {
+      findUnique: vi.fn(async () => ({ isDefault: true, gitDefaultBranch: "main" })),
+    },
     taughtSkill: { findMany: vi.fn(async () => []) },
     agentSecret: { findMany: vi.fn(async () => []) },
     user: { findUnique: vi.fn(async () => null) },
diff --git a/packages/adapters/src/executor-readonly-approval.test.ts b/packages/adapters/src/executor-readonly-approval.test.ts
index 5a1b0ab..08be7d0 100644
--- a/packages/adapters/src/executor-readonly-approval.test.ts
+++ b/packages/adapters/src/executor-readonly-approval.test.ts
@@ -137,10 +137,15 @@ function fixture({
     userModelCredential: { findFirst: vi.fn(async () => null) },
     deploymentSettings: {
       findUnique: vi.fn(async () => ({
+        ownerUserId: null,
+        ownerGithubTokenCipher: null,
         defaultModelProvider: "scripted",
         defaultModelId: "scripted",
       })),
     },
+    space: {
+      findUnique: vi.fn(async () => ({ isDefault: true, gitDefaultBranch: "main" })),
+    },
     taughtSkill: { findMany: vi.fn(async () => []) },
     agentSecret: { findMany: vi.fn(async () => []) },
     user: { findUnique: vi.fn(async () => null) },