@vellumai/assistant 0.4.55 → 0.4.57

package/src/__tests__/send-endpoint-busy.test.ts

@@ -2,8 +2,8 @@
  * Tests for POST /v1/messages queue-if-busy behavior and hub publishing.
  *
  * Validates that:
- * - Messages are accepted (202) when the session is idle, with hub events published.
- * - Messages are queued (202, queued: true) when the session is busy, not 409.
+ * - Messages are accepted (202) when the conversation is idle, with hub events published.
+ * - Messages are queued (202, queued: true) when the conversation is busy, not 409.
  * - SSE subscribers receive events from messages sent via this endpoint.
  */
 import { mkdtempSync, realpathSync, rmSync } from "node:fs";
@@ -14,9 +14,12 @@ import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
 mock.module("../config/env.js", () => ({ isHttpAuthDisabled: () => true }));
 
 import { createGuardianBinding } from "../contacts/contacts-write.js";
+import type { Conversation } from "../daemon/conversation.js";
 import type { ServerMessage } from "../daemon/message-protocol.js";
-import type { Session } from "../daemon/session.js";
-import { createCanonicalGuardianRequest } from "../memory/canonical-guardian-store.js";
+import {
+  createCanonicalGuardianRequest,
+  getCanonicalGuardianRequest,
+} from "../memory/canonical-guardian-store.js";
 import { getOrCreateConversation } from "../memory/conversation-key-store.js";
 
 const testDir = realpathSync(
@@ -49,9 +52,22 @@ mock.module("../config/loader.js", () => ({
     model: "test",
     provider: "test",
     memory: { enabled: false },
-    rateLimit: { maxRequestsPerMinute: 0, maxTokensPerSession: 0 },
+    rateLimit: { maxRequestsPerMinute: 0 },
     secretDetection: { enabled: false },
     contextWindow: { maxInputTokens: 200000 },
+    services: {
+      inference: {
+        mode: "your-own",
+        provider: "anthropic",
+        model: "claude-opus-4-6",
+      },
+      "image-generation": {
+        mode: "your-own",
+        provider: "gemini",
+        model: "gemini-3.1-flash-image-preview",
+      },
+      "web-search": { mode: "your-own", provider: "inference-provider-native" },
+    },
   }),
 }));
 
@@ -82,11 +98,11 @@ import * as pendingInteractions from "../runtime/pending-interactions.js";
 initializeDb();
 
 // ---------------------------------------------------------------------------
-// Session helpers
+// Conversation helpers
 // ---------------------------------------------------------------------------
 
-/** Session that completes its agent loop quickly and emits a text delta + message_complete. */
-function makeCompletingSession(): Session {
+/** Conversation that completes its agent loop quickly and emits a text delta + message_complete. */
+function makeCompletingConversation(): Conversation {
   let processing = false;
   const messages: unknown[] = [];
   return {
@@ -129,17 +145,17 @@ function makeCompletingSession(): Session {
       onEvent: (msg: ServerMessage) => void,
     ) => {
       onEvent({ type: "assistant_text_delta", text: "Hello!" });
-      onEvent({ type: "message_complete", sessionId: "test-session" });
+      onEvent({ type: "message_complete", conversationId: "test-session" });
       processing = false;
     },
     handleConfirmationResponse: () => {},
     handleSecretResponse: () => {},
     getMessages: () => messages as never[],
-  } as unknown as Session;
+  } as unknown as Conversation;
 }
 
-/** Session that hangs forever in the agent loop (simulates a busy session). */
-function makeHangingSession(): Session {
+/** Conversation that hangs forever in the agent loop (simulates a busy conversation). */
+function makeHangingConversation(): Conversation {
   let processing = false;
   const messages: unknown[] = [];
   const enqueuedMessages: Array<{
@@ -197,15 +213,15 @@ function makeHangingSession(): Session {
     handleSecretResponse: () => {},
     getMessages: () => messages as never[],
     _enqueuedMessages: enqueuedMessages,
-  } as unknown as Session;
+  } as unknown as Conversation;
 }
 
-function makePendingApprovalSession(
+function makePendingApprovalConversation(
   requestId: string,
   processing: boolean,
   options?: { queueDepth?: number },
 ): {
-  session: Session;
+  conversation: Conversation;
   runAgentLoopMock: ReturnType<typeof mock>;
   enqueueMessageMock: ReturnType<typeof mock>;
   denyAllPendingConfirmationsMock: ReturnType<typeof mock>;
@@ -233,7 +249,7 @@ function makePendingApprovalSession(
     pending.delete(resolvedRequestId);
   });
 
-  const session = {
+  const conversation = {
     isProcessing: () => processing,
     persistUserMessage: (
       _content: string,
@@ -274,10 +290,10 @@ function makePendingApprovalSession(
     handleConfirmationResponse: handleConfirmationResponseMock,
     handleSecretResponse: () => {},
     getMessages: () => messages as never[],
-  } as unknown as Session;
+  } as unknown as Conversation;
 
   return {
-    session,
+    conversation,
     runAgentLoopMock,
     enqueueMessageMock,
     denyAllPendingConfirmationsMock,
@@ -329,7 +345,7 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
   });
 
   async function startServer(
-    sessionFactory: () => Session,
+    conversationFactory: () => Conversation,
     options?: { approvalConversationGenerator?: ApprovalConversationGenerator },
   ): Promise<void> {
     port = 19000 + Math.floor(Math.random() * 1000);
@@ -338,7 +354,7 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
       bearerToken: TEST_TOKEN,
       approvalConversationGenerator: options?.approvalConversationGenerator,
       sendMessageDeps: {
-        getOrCreateSession: async () => sessionFactory(),
+        getOrCreateConversation: async () => conversationFactory(),
         assistantEventHub: eventHub,
         resolveAttachments: () => [],
       },
@@ -354,10 +370,10 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
     return `http://127.0.0.1:${port}/v1/messages`;
   }
 
-  // ── Idle session: immediate processing ──────────────────────────────
+  // ── Idle conversation: immediate processing ─────────────────────────
 
-  test("returns 202 with accepted: true and messageId when session is idle", async () => {
-    await startServer(() => makeCompletingSession());
+  test("returns 202 with accepted: true and messageId when conversation is idle", async () => {
+    await startServer(() => makeCompletingConversation());
 
     const res = await fetch(messagesUrl(), {
       method: "POST",
@@ -384,10 +400,10 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
     await stopServer();
   });
 
-  test("publishes events to assistantEventHub when session is idle", async () => {
+  test("publishes events to assistantEventHub when conversation is idle", async () => {
     const publishedEvents: AssistantEvent[] = [];
 
-    await startServer(() => makeCompletingSession());
+    await startServer(() => makeCompletingConversation());
 
     eventHub.subscribe({ assistantId: "self" }, (event) => {
       publishedEvents.push(event);
@@ -421,15 +437,15 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
     const { conversationId } = getOrCreateConversation(conversationKey);
     const requestId = "req-inline-idle";
     const {
-      session,
+      conversation,
       runAgentLoopMock,
       enqueueMessageMock,
       denyAllPendingConfirmationsMock,
       handleConfirmationResponseMock,
-    } = makePendingApprovalSession(requestId, false);
+    } = makePendingApprovalConversation(requestId, false);
 
     pendingInteractions.register(requestId, {
-      session,
+      conversation,
       conversationId,
       kind: "confirmation",
     });
@@ -443,10 +459,10 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
       guardianPrincipalId: "test-principal-id",
       status: "pending",
       requestCode: "ABC123",
-      expiresAt: new Date(Date.now() + 5 * 60 * 1000).toISOString(),
+      expiresAt: Date.now() + 5 * 60 * 1000,
     });
 
-    await startServer(() => session);
+    await startServer(() => conversation);
 
     const res = await fetch(messagesUrl(), {
       method: "POST",
@@ -481,15 +497,15 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
     const { conversationId } = getOrCreateConversation(conversationKey);
     const requestId = "req-inline-nl";
     const {
-      session,
+      conversation,
       runAgentLoopMock,
       enqueueMessageMock,
       denyAllPendingConfirmationsMock,
       handleConfirmationResponseMock,
-    } = makePendingApprovalSession(requestId, false);
+    } = makePendingApprovalConversation(requestId, false);
 
     pendingInteractions.register(requestId, {
-      session,
+      conversation,
       conversationId,
       kind: "confirmation",
     });
@@ -503,7 +519,7 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
       status: "pending",
       guardianPrincipalId: "test-principal-id",
       requestCode: "C0FFEE",
-      expiresAt: new Date(Date.now() + 5 * 60 * 1000).toISOString(),
+      expiresAt: Date.now() + 5 * 60 * 1000,
     });
 
     const approvalConversationGenerator: ApprovalConversationGenerator = async (
@@ -514,7 +530,7 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
       targetRequestId: context.pendingApprovals[0]?.requestId,
     });
 
-    await startServer(() => session, { approvalConversationGenerator });
+    await startServer(() => conversation, { approvalConversationGenerator });
 
     const res = await fetch(messagesUrl(), {
       method: "POST",
@@ -549,15 +565,15 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
     const { conversationId } = getOrCreateConversation(conversationKey);
     const requestId = "req-inline-busy";
     const {
-      session,
+      conversation,
       runAgentLoopMock,
       enqueueMessageMock,
       denyAllPendingConfirmationsMock,
       handleConfirmationResponseMock,
-    } = makePendingApprovalSession(requestId, true);
+    } = makePendingApprovalConversation(requestId, true);
 
     pendingInteractions.register(requestId, {
-      session,
+      conversation,
       conversationId,
       kind: "confirmation",
     });
@@ -571,10 +587,10 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
       status: "pending",
       guardianPrincipalId: "test-principal-id",
       requestCode: "DEF456",
-      expiresAt: new Date(Date.now() + 5 * 60 * 1000).toISOString(),
+      expiresAt: Date.now() + 5 * 60 * 1000,
     });
 
-    await startServer(() => session);
+    await startServer(() => conversation);
 
     const res = await fetch(messagesUrl(), {
       method: "POST",
@@ -609,15 +625,15 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
     const { conversationId } = getOrCreateConversation(conversationKey);
     const requestId = "req-inline-busy-queued";
     const {
-      session,
+      conversation,
       runAgentLoopMock,
       enqueueMessageMock,
       denyAllPendingConfirmationsMock,
       handleConfirmationResponseMock,
-    } = makePendingApprovalSession(requestId, true, { queueDepth: 2 });
+    } = makePendingApprovalConversation(requestId, true, { queueDepth: 2 });
 
     pendingInteractions.register(requestId, {
-      session,
+      conversation,
       conversationId,
       kind: "confirmation",
     });
@@ -631,10 +647,10 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
       status: "pending",
       guardianPrincipalId: "test-principal-id",
       requestCode: "Q2D456",
-      expiresAt: new Date(Date.now() + 5 * 60 * 1000).toISOString(),
+      expiresAt: Date.now() + 5 * 60 * 1000,
     });
 
-    await startServer(() => session);
+    await startServer(() => conversation);
 
     const res = await fetch(messagesUrl(), {
       method: "POST",
@@ -669,15 +685,15 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
     const { conversationId } = getOrCreateConversation(conversationKey);
     const requestId = "req-inline-reject";
     const {
-      session,
+      conversation,
       runAgentLoopMock,
       enqueueMessageMock,
       denyAllPendingConfirmationsMock,
       handleConfirmationResponseMock,
-    } = makePendingApprovalSession(requestId, false);
+    } = makePendingApprovalConversation(requestId, false);
 
     pendingInteractions.register(requestId, {
-      session,
+      conversation,
       conversationId,
       kind: "confirmation",
     });
@@ -691,10 +707,10 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
       status: "pending",
       guardianPrincipalId: "test-principal-id",
       requestCode: "GHI789",
-      expiresAt: new Date(Date.now() + 5 * 60 * 1000).toISOString(),
+      expiresAt: Date.now() + 5 * 60 * 1000,
     });
 
-    await startServer(() => session);
+    await startServer(() => conversation);
 
     const res = await fetch(messagesUrl(), {
       method: "POST",
@@ -729,13 +745,13 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
     const conversationKey = "conv-inline-ambiguous";
     const { conversationId } = getOrCreateConversation(conversationKey);
     const requestId = "req-inline-ambiguous";
-    const { session, runAgentLoopMock } = makePendingApprovalSession(
+    const { conversation, runAgentLoopMock } = makePendingApprovalConversation(
       requestId,
       false,
     );
 
     pendingInteractions.register(requestId, {
-      session,
+      conversation,
       conversationId,
       kind: "confirmation",
     });
@@ -749,10 +765,10 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
       status: "pending",
       guardianPrincipalId: "test-principal-id",
       requestCode: "JKL012",
-      expiresAt: new Date(Date.now() + 5 * 60 * 1000).toISOString(),
+      expiresAt: Date.now() + 5 * 60 * 1000,
     });
 
-    await startServer(() => session);
+    await startServer(() => conversation);
 
     const res = await fetch(messagesUrl(), {
       method: "POST",
@@ -780,13 +796,13 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
     await stopServer();
   });
 
-  // ── Busy session: queue-if-busy ─────────────────────────────────────
+  // ── Busy conversation: queue-if-busy ────────────────────────────────
 
-  test("returns 202 with queued: true when session is busy (not 409)", async () => {
-    const session = makeHangingSession();
-    await startServer(() => session);
+  test("returns 202 with queued: true when conversation is busy (not 409)", async () => {
+    const conversation = makeHangingConversation();
+    await startServer(() => conversation);
 
-    // First message starts the agent loop and makes the session busy
+    // First message starts the agent loop and makes the conversation busy
     const res1 = await fetch(messagesUrl(), {
       method: "POST",
       headers: { "Content-Type": "application/json", ...AUTH_HEADERS },
@@ -837,7 +853,7 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
   // ── Validation ──────────────────────────────────────────────────────
 
   test("returns 400 when sourceChannel is missing", async () => {
-    await startServer(() => makeCompletingSession());
+    await startServer(() => makeCompletingConversation());
 
     const res = await fetch(messagesUrl(), {
       method: "POST",
@@ -850,7 +866,7 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
   });
 
   test("returns 400 when content is empty", async () => {
-    await startServer(() => makeCompletingSession());
+    await startServer(() => makeCompletingConversation());
 
     const res = await fetch(messagesUrl(), {
       method: "POST",
@@ -868,7 +884,7 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
   });
 
   test("returns 400 when conversationKey is missing", async () => {
-    await startServer(() => makeCompletingSession());
+    await startServer(() => makeCompletingConversation());
 
     const res = await fetch(messagesUrl(), {
       method: "POST",
@@ -883,4 +899,60 @@ describe("POST /v1/messages — queue-if-busy and hub publishing", () => {
 
     await stopServer();
   });
+
+  test("auto-deny resolves canonical guardian request so stale records do not cause pending_interaction_not_found", async () => {
+    const conversationKey = "conv-auto-deny-canonical";
+    const { conversationId } = getOrCreateConversation(conversationKey);
+    const requestId = "req-auto-deny-canonical";
+
+    // Step 1: Create a pending approval conversation with a canonical request.
+    const { conversation, denyAllPendingConfirmationsMock } =
+      makePendingApprovalConversation(requestId, false);
+
+    pendingInteractions.register(requestId, {
+      conversation,
+      conversationId,
+      kind: "confirmation",
+    });
+    createCanonicalGuardianRequest({
+      id: requestId,
+      kind: "tool_approval",
+      sourceType: "desktop",
+      sourceChannel: "vellum",
+      conversationId,
+      toolName: "bash",
+      guardianPrincipalId: "test-principal-id",
+      status: "pending",
+      requestCode: "STALE1",
+      expiresAt: Date.now() + 5 * 60 * 1000,
+    });
+
+    await startServer(() => conversation);
+
+    // Step 2: Send a non-approval message to trigger auto-deny of the
+    // pending confirmation. "do something else" is not an approval phrase,
+    // so tryConsumeCanonicalGuardianReply won't consume it, and the
+    // auto-deny path will fire.
+    const res = await fetch(messagesUrl(), {
+      method: "POST",
+      headers: { "Content-Type": "application/json", ...AUTH_HEADERS },
+      body: JSON.stringify({
+        conversationKey,
+        content: "do something else instead",
+        sourceChannel: "vellum",
+        interface: "macos",
+      }),
+    });
+    expect(res.status).toBe(202);
+    expect(denyAllPendingConfirmationsMock).toHaveBeenCalledTimes(1);
+
+    // Step 3: Verify the canonical guardian request was resolved to "denied".
+    // Without the fix, this would remain "pending", causing
+    // pending_interaction_not_found errors on subsequent "yes" messages.
+    const canonicalRequest = getCanonicalGuardianRequest(requestId);
+    expect(canonicalRequest).toBeDefined();
+    expect(canonicalRequest!.status).toBe("denied");
+
+    await stopServer();
+  });
 });

package/src/__tests__/send-notification-tool.test.ts

@@ -28,7 +28,6 @@ describe("send-notification tool", () => {
       },
       {
         workingDir: "/tmp",
-        sessionId: "sess-1",
         conversationId: "conv-1",
         assistantId: "ast-alpha",
         trustClass: "guardian" as const,
@@ -40,7 +39,7 @@ describe("send-notification tool", () => {
     expect(emitNotificationSignalMock).toHaveBeenCalledWith({
       sourceEventName: "user.send_notification",
       sourceChannel: "assistant_tool",
-      sourceSessionId: "conv-override",
+      sourceContextId: "conv-override",
       attentionHints: {
         requiresAction: true,
         urgency: "high",
@@ -51,7 +50,7 @@ describe("send-notification tool", () => {
       contextPayload: {
         requestedMessage: "Your verification code is 123456",
         requestedByTool: "send_notification",
-        requestedBySessionId: "sess-1",
+        requestedByContextId: "conv-1",
         requestedTitle: "Verification code",
         requestedByConversationId: "conv-override",
         preferredChannels: ["vellum"],
@@ -71,7 +70,6 @@ describe("send-notification tool", () => {
       { message: "test notification" },
       {
         workingDir: "/tmp",
-        sessionId: "sess-1",
         conversationId: "conv-1",
         assistantId: "ast-alpha",
         trustClass: "guardian" as const,

package/src/__tests__/sequence-store.test.ts

@@ -58,7 +58,7 @@ const testSteps: SequenceStep[] = [
     delaySeconds: 0,
     subjectTemplate: "Intro",
     bodyPrompt: "Write an intro email",
-    replyToThread: false,
+    replyInSameConversation: false,
     requireApproval: false,
   },
   {
@@ -66,7 +66,7 @@ const testSteps: SequenceStep[] = [
     delaySeconds: 86400,
     subjectTemplate: "Follow up",
     bodyPrompt: "Write a follow-up",
-    replyToThread: true,
+    replyInSameConversation: true,
     requireApproval: false,
   },
   {
@@ -74,7 +74,7 @@ const testSteps: SequenceStep[] = [
     delaySeconds: 259200,
     subjectTemplate: "Final check",
     bodyPrompt: "Write a final check-in",
-    replyToThread: true,
+    replyInSameConversation: true,
     requireApproval: true,
   },
 ];
@@ -364,7 +364,7 @@ describe("sequence-store", () => {
           delaySeconds: 86400,
           subjectTemplate: "Future",
           bodyPrompt: "Later",
-          replyToThread: false,
+          replyInSameConversation: false,
           requireApproval: false,
         },
       ];
@@ -444,7 +444,7 @@ describe("sequence-store", () => {
         Date.now() + 86400000,
       );
       expect(advanced!.currentStep).toBe(1);
-      expect(advanced!.threadId).toBe("thread-123");
+      expect(advanced!.conversationId).toBe("thread-123");
     });
 
     test("returns undefined for non-existent id", () => {

package/src/__tests__/shell-credential-ref.test.ts

@@ -23,7 +23,6 @@ mock.module("../config/loader.js", () => ({
     ui: {},
 
     timeouts: { shellDefaultTimeoutSec: 120, shellMaxTimeoutSec: 600 },
-    sandbox: { enabled: false, backend: "none" },
     secretDetection: { allowOneTimeSend: false },
   }),
 }));
@@ -86,7 +85,6 @@ import type { ToolContext } from "../tools/types.js";
 
 const ctx: ToolContext = {
   workingDir: "/tmp",
-  sessionId: "test-session",
   conversationId: "test-conv",
   trustClass: "guardian",
 };
@@ -166,7 +164,7 @@ describe("shell tool credential ref resolution", () => {
     expect(result.isError).toBe(true);
     expect(result.content).toContain("unknown credential reference");
     expect(result.content).toContain("nonexistent/key");
-    // Session should NOT have been created
+    // Conversation should NOT have been created
     expect(mockGetOrStartSession).not.toHaveBeenCalled();
   });
 

package/src/__tests__/shell-tool-proxy-mode.test.ts

@@ -34,8 +34,7 @@ const mockConfig = {
     shellMaxTimeoutSec: 600,
     permissionTimeoutSec: 300,
   },
-  sandbox: { enabled: false },
-  rateLimit: { maxRequestsPerMinute: 0, maxTokensPerSession: 0 },
+  rateLimit: { maxRequestsPerMinute: 0 },
   secretDetection: {
     enabled: true,
     action: "warn" as const,
@@ -178,7 +177,6 @@ import type { ToolContext } from "../tools/types.js";
 function makeContext(overrides?: Partial<ToolContext>): ToolContext {
   return {
     workingDir: "/tmp",
-    sessionId: "test-session",
     conversationId: "test-conv",
     trustClass: "guardian",
     ...overrides,
@@ -233,7 +231,7 @@ describe("shell tool proxy mode", () => {
 
     expect(result.isError).toBe(false);
 
-    // Session acquired via getOrStartSession
+    // Conversation acquired via getOrStartSession
     expect(getOrStartSessionCalls).toHaveLength(1);
     expect(getOrStartSessionCalls[0].conversationId).toBe("test-conv");
     expect(getOrStartSessionCalls[0].credentialIds).toEqual(["cred-1"]);
@@ -251,7 +249,7 @@ describe("shell tool proxy mode", () => {
       "/tmp/test-data/proxy-ca/ca.pem",
     );
 
-    // Session is NOT stopped after command — idle timer handles cleanup
+    // Conversation is NOT stopped after command — idle timer handles cleanup
     expect(getSessionEnvCalls).toHaveLength(1);
     expect(getSessionEnvCalls[0]).toBe(MOCK_SESSION_ID);
   });

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

@@ -98,8 +98,7 @@ function buildSkillSummary(
     directoryPath: `/fake/skills/${id}`,
     skillFilePath: `/fake/skills/${id}/SKILL.md`,
     bundled: source === "bundled",
-    userInvocable: true,
-    disableModelInvocation: false,
+
     source,
     featureFlag,
   };

package/src/__tests__/skill-feature-flags.test.ts

@@ -5,9 +5,9 @@ import type { AssistantConfig } from "../config/schema.js";
 import { resolveSkillStates, skillFlagKey } from "../config/skill-state.js";
 import type { SkillSummary } from "../config/skills.js";
 
-const DECLARED_FLAG_ID = "hatch-new-assistant";
+const DECLARED_FLAG_ID = "contacts";
 const DECLARED_FLAG_KEY = `feature_flags.${DECLARED_FLAG_ID}.enabled`;
-const DECLARED_SKILL_ID = "hatch-new-assistant";
+const DECLARED_SKILL_ID = "contacts";
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
@@ -48,8 +48,7 @@ function makeSkill(
     directoryPath: `/fake/skills/${id}`,
     skillFilePath: `/fake/skills/${id}/SKILL.md`,
     bundled: source === "bundled",
-    userInvocable: true,
-    disableModelInvocation: false,
+
     source,
     featureFlag,
   };
@@ -141,7 +140,7 @@ describe("isAssistantFeatureFlagEnabled", () => {
 
   test("falls back to registry default when no override", () => {
     const config = makeConfig();
-    // hatch-new-assistant defaults to false in the registry
+    // contacts defaults to false in the registry
     expect(isAssistantFeatureFlagEnabled(DECLARED_FLAG_KEY, config)).toBe(
       false,
     );
@@ -213,7 +212,7 @@ describe("resolveSkillStates with feature flags", () => {
     const config = makeConfig();
 
     const resolved = resolveSkillStates(catalog, config);
-    // hatch-new-assistant registry default is false, so it's filtered out
+    // contacts registry default is false, so it's filtered out
     expect(resolved.length).toBe(0);
   });
 
@@ -271,7 +270,7 @@ describe("resolveSkillStates with feature flags", () => {
     const resolved = resolveSkillStates(catalog, config);
     const ids = resolved.map((r) => r.summary.id);
 
-    // hatch-new-assistant and deploy explicitly false; browser explicitly true
+    // contacts and deploy explicitly false; browser explicitly true
     expect(ids).toEqual(["browser"]);
   });
 });
@@ -282,7 +281,7 @@ describe("resolveSkillStates with feature flags", () => {
 
 describe("resolveSkillStates with frontmatter featureFlag", () => {
   test("skill with featureFlag (defaultEnabled: false) is filtered when no config override", () => {
-    // hatch-new-assistant has defaultEnabled: false in the registry
+    // contacts has defaultEnabled: false in the registry
     const catalog = [makeSkill(DECLARED_SKILL_ID, "bundled", DECLARED_FLAG_ID)];
     const config = makeConfig();