@vellumai/assistant 0.4.29 → 0.4.30

package/src/__tests__/assistant-feature-flags-integration.test.ts

@@ -146,16 +146,20 @@ describe("buildSystemPrompt assistant feature flag filtering", () => {
 
     currentConfig = {
       sandbox: { enabled: false, backend: "native" },
-      assistantFeatureFlagValues: { [DECLARED_FLAG_KEY]: false },
+      assistantFeatureFlagValues: {
+        [DECLARED_FLAG_KEY]: false,
+        "feature_flags.twitter.enabled": true,
+      },
     };
 
     const result = buildSystemPrompt();
 
+    // twitter is explicitly enabled, declared flagged skill is explicitly off
     expect(result).toContain('id="twitter"');
     expect(result).not.toContain(`id="${DECLARED_SKILL_ID}"`);
   });
 
-  test("all skills visible when no flag overrides set", () => {
+  test("declared skills hidden when no flag overrides set (registry defaults to false)", () => {
     createSkillOnDisk(
       DECLARED_SKILL_ID,
       "Hatch New Assistant",
@@ -169,8 +173,9 @@ describe("buildSystemPrompt assistant feature flag filtering", () => {
 
     const result = buildSystemPrompt();
 
-    expect(result).toContain(`id="${DECLARED_SKILL_ID}"`);
-    expect(result).toContain('id="twitter"');
+    // Both skills are declared in the registry with defaultEnabled: false
+    expect(result).not.toContain(`id="${DECLARED_SKILL_ID}"`);
+    expect(result).not.toContain('id="twitter"');
   });
 
   test("flagged-off skills hidden when all flags are OFF", () => {
@@ -227,7 +232,7 @@ describe("buildSystemPrompt assistant feature flag filtering", () => {
     expect(result).not.toContain('id="browser"');
   });
 
-  test("undeclared flags with no persisted override default to enabled", () => {
+  test("declared flags with no persisted override use registry default", () => {
     createSkillOnDisk("browser", "Browser", "Web browsing automation");
 
     currentConfig = {
@@ -236,7 +241,8 @@ describe("buildSystemPrompt assistant feature flag filtering", () => {
 
     const result = buildSystemPrompt();
 
-    expect(result).toContain('id="browser"');
+    // browser is declared in the registry with defaultEnabled: false
+    expect(result).not.toContain('id="browser"');
   });
 });
 
@@ -265,10 +271,12 @@ describe("isAssistantFeatureFlagEnabled", () => {
 
   test("missing persisted value falls back to defaults registry defaultEnabled", () => {
     // No explicit config at all — should fall back to defaults registry
-    // which has defaultEnabled: true for hatch-new-assistant
+    // which has defaultEnabled: false for hatch-new-assistant
     const config = {} as any;
 
-    expect(isAssistantFeatureFlagEnabled(DECLARED_FLAG_KEY, config)).toBe(true);
+    expect(isAssistantFeatureFlagEnabled(DECLARED_FLAG_KEY, config)).toBe(
+      false,
+    );
   });
 
   test("unknown flag defaults to true when no persisted override", () => {
@@ -302,9 +310,9 @@ describe("legacy isSkillFeatureEnabled backward compat", () => {
     expect(isSkillFeatureEnabled(DECLARED_SKILL_ID, config)).toBe(false);
   });
 
-  test("enabled when no override set", () => {
+  test("disabled when no override set (registry default is false)", () => {
     const config = {} as any;
 
-    expect(isSkillFeatureEnabled(DECLARED_SKILL_ID, config)).toBe(true);
+    expect(isSkillFeatureEnabled(DECLARED_SKILL_ID, config)).toBe(false);
   });
 });

package/src/__tests__/browser-skill-endstate.test.ts

@@ -4,7 +4,16 @@
  * Locks the final invariants from the BROWSER_SKILL plan so that future
  * changes cannot silently regress any of the migration guarantees.
  */
-import { afterAll, beforeAll, describe, expect, test } from "bun:test";
+import { afterAll, beforeAll, describe, expect, mock, test } from "bun:test";
+
+mock.module("../config/loader.js", () => ({
+  getConfig: () => ({
+    sandbox: { enabled: false, backend: "native" },
+    assistantFeatureFlagValues: {
+      "feature_flags.browser.enabled": true,
+    },
+  }),
+}));
 
 import {
   projectSkillTools,

package/src/__tests__/bundled-skill-retrieval-guard.test.ts

@@ -62,6 +62,7 @@ const GATEWAY_RETRIEVAL_BANLIST: Array<{
     bannedSnippets: [
       'curl -s "$INTERNAL_GATEWAY_BASE_URL/v1/ingress/members',
       'curl -s "$INTERNAL_GATEWAY_BASE_URL/v1/ingress/invites',
+      'curl -s "$INTERNAL_GATEWAY_BASE_URL/v1/contacts/invites',
       'curl -s "$INTERNAL_GATEWAY_BASE_URL/v1/integrations/telegram/config',
     ],
   },

package/src/__tests__/channel-approval-routes.test.ts

@@ -280,7 +280,7 @@ describe("inbound callback metadata triggers decision handling", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     // Establish the conversation to get a conversationId mapping
     const initReq = makeInboundRequest({ content: "init" });
@@ -321,7 +321,7 @@ describe("inbound callback metadata triggers decision handling", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({ content: "init" });
     await handleChannelInbound(initReq, noopProcessMessage);
@@ -374,7 +374,7 @@ describe("inbound text matching approval phrases triggers decision handling", ()
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({ content: "init" });
     await handleChannelInbound(initReq, noopProcessMessage);
@@ -407,7 +407,7 @@ describe("inbound text matching approval phrases triggers decision handling", ()
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({ content: "init" });
     await handleChannelInbound(initReq, noopProcessMessage);
@@ -456,7 +456,7 @@ describe("non-decision messages during pending approval (legacy fallback)", () =
     const replySpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({ content: "init" });
     await handleChannelInbound(initReq, noopProcessMessage);
@@ -565,7 +565,7 @@ describe("empty content with callbackData bypasses validation", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const req = makeInboundRequest({
       content: "",
@@ -603,7 +603,7 @@ describe("empty content with callbackData bypasses validation", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     // Send with no content field at all, just callbackData
     const reqBody = {
@@ -651,7 +651,7 @@ describe("callback requestId validation", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({ content: "init" });
     await handleChannelInbound(initReq, noopProcessMessage);
@@ -691,7 +691,7 @@ describe("callback requestId validation", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({ content: "init" });
     await handleChannelInbound(initReq, noopProcessMessage);
@@ -729,7 +729,7 @@ describe("callback requestId validation", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({ content: "init" });
     await handleChannelInbound(initReq, noopProcessMessage);
@@ -779,7 +779,7 @@ describe("no immediate reply after approval decision", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({ content: "init" });
     await handleChannelInbound(initReq, noopProcessMessage);
@@ -818,7 +818,7 @@ describe("no immediate reply after approval decision", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({ content: "init" });
     await handleChannelInbound(initReq, noopProcessMessage);
@@ -934,7 +934,7 @@ describe("SMS channel approval decisions", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     // Establish the conversation via SMS
     const initReq = makeSmsInboundRequest({ content: "init" });
@@ -968,7 +968,7 @@ describe("SMS channel approval decisions", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeSmsInboundRequest({ content: "init" });
     await handleChannelInbound(initReq, noopProcessMessage);
@@ -1001,7 +1001,7 @@ describe("SMS channel approval decisions", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
     const approvalSpy = spyOn(
       gatewayClient,
       "deliverApprovalPrompt",
@@ -1061,7 +1061,7 @@ describe("SMS guardian verify intercept", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const req = new Request("http://localhost/channels/inbound", {
       method: "POST",
@@ -1105,7 +1105,7 @@ describe("SMS guardian verify intercept", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const req = new Request("http://localhost/channels/inbound", {
       method: "POST",
@@ -1202,7 +1202,7 @@ describe("guardian decision scoping — multiple pending approvals", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const olderConvId = "conv-scope-older";
     const newerConvId = "conv-scope-newer";
@@ -1287,7 +1287,7 @@ describe("ambiguous plain-text decision with multiple pending requests", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const convA = "conv-ambig-a";
     const convB = "conv-ambig-b";
@@ -1376,7 +1376,7 @@ describe("expired guardian approval auto-denies via sweep", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const convId = "conv-expiry-sweep";
     ensureConversation(convId);
@@ -1440,7 +1440,7 @@ describe("expired guardian approval auto-denies via sweep", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const convId = "conv-not-expired";
     ensureConversation(convId);
@@ -1515,7 +1515,7 @@ describe("assistant-scoped guardian verification via handleChannelInbound", () =
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const req = makeInboundRequest({
       content: secret,
@@ -1543,7 +1543,7 @@ describe("assistant-scoped guardian verification via handleChannelInbound", () =
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const req = makeInboundRequest({
       content: secret,
@@ -1577,7 +1577,7 @@ describe("assistant-scoped guardian verification via handleChannelInbound", () =
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const req = makeInboundRequest({
       content: secret,
@@ -1677,7 +1677,7 @@ describe("conversational approval engine — standard path", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({ content: "init" });
     await handleChannelInbound(initReq, noopProcessMessage);
@@ -1735,7 +1735,7 @@ describe("conversational approval engine — standard path", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({ content: "init" });
     await handleChannelInbound(initReq, noopProcessMessage);
@@ -1783,7 +1783,7 @@ describe("conversational approval engine — standard path", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({ content: "init" });
     await handleChannelInbound(initReq, noopProcessMessage);
@@ -1830,7 +1830,7 @@ describe("conversational approval engine — standard path", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({ content: "init" });
     await handleChannelInbound(initReq, noopProcessMessage);
@@ -1896,7 +1896,7 @@ describe("guardian conversational approval via conversation engine", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const convId = "conv-guardian-clarify";
     ensureConversation(convId);
@@ -1978,7 +1978,7 @@ describe("guardian conversational approval via conversation engine", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const convId = "conv-guardian-nlp";
     ensureConversation(convId);
@@ -2058,7 +2058,7 @@ describe("guardian conversational approval via conversation engine", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const convId = "conv-guardian-downgrade";
     ensureConversation(convId);
@@ -2113,7 +2113,7 @@ describe("guardian conversational approval via conversation engine", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const convA = "conv-multi-a";
     const convB = "conv-multi-b";
@@ -2218,7 +2218,7 @@ describe("keep_pending remains conversational — standard path", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({ content: "init" });
     await handleChannelInbound(initReq, noopProcessMessage);
@@ -2277,7 +2277,7 @@ describe("keep_pending remains conversational — guardian path", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const convId = "conv-gfb-1";
     ensureConversation(convId);
@@ -2367,7 +2367,7 @@ describe("requester cancel of guardian-gated pending request", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     // Create requester conversation
     const initReq = makeInboundRequest({
@@ -2450,7 +2450,7 @@ describe("requester cancel of guardian-gated pending request", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({
       content: "init",
@@ -2526,7 +2526,7 @@ describe("requester cancel of guardian-gated pending request", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({
       content: "init",
@@ -2599,7 +2599,7 @@ describe("requester cancel of guardian-gated pending request", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({
       content: "init",
@@ -2669,7 +2669,7 @@ describe("engine decision race condition — standard path", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({ content: "init" });
     await handleChannelInbound(initReq, noopProcessMessage);
@@ -2737,7 +2737,7 @@ describe("engine decision race condition — guardian path", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const convId = "conv-guardian-race";
     ensureConversation(convId);
@@ -2828,7 +2828,7 @@ describe("non-decision status reply for different channels", () => {
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     // Establish the conversation using sms (non-rich channel)
     const initReq = makeInboundRequest({
@@ -2875,7 +2875,7 @@ describe("non-decision status reply for different channels", () => {
     const replySpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     // Establish the conversation using telegram (rich channel)
     const initReq = makeInboundRequest({
@@ -3318,7 +3318,7 @@ describe("trusted-contact self-approval blocked before guardian approval row exi
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     // Create the requester conversation (different user than guardian)
     const initReq = makeInboundRequest({
@@ -3387,7 +3387,7 @@ describe("trusted-contact self-approval blocked before guardian approval row exi
     const deliverSpy = spyOn(
       gatewayClient,
       "deliverChannelReply",
-    ).mockResolvedValue(undefined);
+    ).mockResolvedValue({ ok: true });
 
     const initReq = makeInboundRequest({
       content: "init",

package/src/__tests__/channel-approval.test.ts

@@ -229,6 +229,14 @@ describe("parseCallbackData", () => {
     expect(result!.source).toBe("whatsapp_button");
   });
 
+  test("parses slack source channel", () => {
+    const result = parseCallbackData("apr:req-789:approve_once", "slack");
+    expect(result).not.toBeNull();
+    expect(result!.action).toBe("approve_once");
+    expect(result!.requestId).toBe("req-789");
+    expect(result!.source).toBe("slack_button");
+  });
+
   test("returns null for unknown action", () => {
     expect(parseCallbackData("apr:req-123:unknown_action")).toBeNull();
   });

package/src/__tests__/channel-approvals.test.ts

@@ -234,6 +234,41 @@ describe("buildApprovalUIMetadata", () => {
     expect(metadata.requestId).toBe("req-abc");
     expect(metadata.actions).toEqual(prompt.actions);
     expect(metadata.plainTextFallback).toBe("Reply yes or no.");
+    expect(metadata.permissionDetails).toEqual({
+      toolName: "shell",
+      riskLevel: "low",
+      toolInput: { command: "ls" },
+    });
+  });
+
+  test("includes requesterIdentifier in permissionDetails when provided", () => {
+    const prompt: ChannelApprovalPrompt = {
+      promptText: "Allow deploy?",
+      actions: [
+        { id: "approve_once", label: "Approve once" },
+        { id: "reject", label: "Reject" },
+      ],
+      plainTextFallback: "Reply yes or no.",
+    };
+
+    const approvalInfo: PendingApprovalInfo = {
+      requestId: "req-guard",
+      toolName: "deploy",
+      input: { target: "prod" },
+      riskLevel: "high",
+    };
+
+    const metadata = buildApprovalUIMetadata(
+      prompt,
+      approvalInfo,
+      "alice@example.com",
+    );
+    expect(metadata.permissionDetails).toEqual({
+      toolName: "deploy",
+      riskLevel: "high",
+      toolInput: { target: "prod" },
+      requesterIdentifier: "alice@example.com",
+    });
   });
 });
 
@@ -478,8 +513,11 @@ describe("channelSupportsRichApprovalUI", () => {
     expect(channelSupportsRichApprovalUI("sms")).toBe(false);
   });
 
+  test("returns true for slack", () => {
+    expect(channelSupportsRichApprovalUI("slack")).toBe(true);
+  });
+
   test("returns false for unknown channels", () => {
-    expect(channelSupportsRichApprovalUI("slack")).toBe(false);
     expect(channelSupportsRichApprovalUI("")).toBe(false);
   });
 });

package/src/__tests__/channel-guardian.test.ts

@@ -394,7 +394,9 @@ describe("guardian service challenge validation", () => {
     );
 
     expect(result.success).toBe(true);
-    expect(result.verificationType).toBe("guardian");
+    if (result.success) {
+      expect(result.verificationType).toBe("guardian");
+    }
   });
 
   test("validateAndConsumeChallenge does not create a guardian binding (caller responsibility)", () => {
@@ -497,7 +499,9 @@ describe("guardian service challenge validation", () => {
     );
 
     expect(result.success).toBe(true);
-    expect(result.verificationType).toBe("guardian");
+    if (result.success) {
+      expect(result.verificationType).toBe("guardian");
+    }
 
     // validateAndConsumeChallenge no longer creates bindings — that is
     // now handled by the caller (verification-intercept / relay-server).
@@ -1757,7 +1761,9 @@ describe("voice guardian challenge validation", () => {
     );
 
     expect(result.success).toBe(true);
-    expect(result.verificationType).toBe("guardian");
+    if (result.success) {
+      expect(result.verificationType).toBe("guardian");
+    }
   });
 
   test("validateAndConsumeChallenge does not create a guardian binding for voice (caller responsibility)", () => {
@@ -2492,7 +2498,9 @@ describe("outbound verification sessions", () => {
     );
 
     expect(result.success).toBe(true);
-    expect(result.verificationType).toBe("guardian");
+    if (result.success) {
+      expect(result.verificationType).toBe("guardian");
+    }
   });
 
   // ── Session state transitions ──
@@ -3022,7 +3030,9 @@ describe("outbound SMS verification", () => {
     );
 
     expect(result.success).toBe(true);
-    expect(result.verificationType).toBe("guardian");
+    if (result.success) {
+      expect(result.verificationType).toBe("guardian");
+    }
   });
 
   test("inbound SMS from wrong identity + correct code is rejected", () => {

package/src/__tests__/channel-reply-delivery.test.ts

@@ -56,6 +56,7 @@ mock.module("../runtime/gateway-client.js", () => ({
       throw new Error("Simulated delivery failure (502)");
     }
     deliveryCalls.push({ callbackUrl, payload, bearerToken });
+    return { ok: true };
   },
 }));
 
@@ -334,6 +335,36 @@ describe("channel-reply-delivery", () => {
     expect(deliveryCalls).toHaveLength(0);
   });
 
+  it("passes ephemeral and user through to each delivery call", async () => {
+    await deliverRenderedReplyViaCallback({
+      callbackUrl: "http://gateway/deliver/slack",
+      chatId: "C123",
+      textSegments: ["Part 1.", "Part 2."],
+      interSegmentDelayMs: 0,
+      ephemeral: true,
+      user: "U456",
+    });
+
+    expect(deliveryCalls).toHaveLength(2);
+    expect(deliveryCalls[0].payload.ephemeral).toBe(true);
+    expect(deliveryCalls[0].payload.user).toBe("U456");
+    expect(deliveryCalls[1].payload.ephemeral).toBe(true);
+    expect(deliveryCalls[1].payload.user).toBe("U456");
+  });
+
+  it("does not include ephemeral fields when not set", async () => {
+    await deliverRenderedReplyViaCallback({
+      callbackUrl: "http://gateway/deliver/slack",
+      chatId: "C123",
+      textSegments: ["Normal message."],
+      interSegmentDelayMs: 0,
+    });
+
+    expect(deliveryCalls).toHaveLength(1);
+    expect(deliveryCalls[0].payload.ephemeral).toBeUndefined();
+    expect(deliveryCalls[0].payload.user).toBeUndefined();
+  });
+
   it("passes startFromSegment through deliverReplyViaCallback options", async () => {
     conversationMessages.push(
       { id: "msg-u", role: "user", content: "hi" },

package/src/__tests__/commit-message-enrichment-service.test.ts

@@ -42,6 +42,10 @@ describe("CommitEnrichmentService", () => {
   beforeEach(() => {
     _resetGitServiceRegistry();
     _resetEnrichmentService();
+    // Previous tests' enrichment jobs may leave a stale index.lock if
+    // the git process exits but the lock file isn't flushed before the
+    // next test runs git operations in the shared testDir.
+    rmSync(join(testDir, ".git", "index.lock"), { force: true });
   });
 
   afterEach(async () => {