@vellumai/assistant 0.4.35 → 0.4.37

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

@@ -35,7 +35,10 @@ let currentConfig: Record<string, unknown> = {
 const DECLARED_FLAG_KEY = "feature_flags.hatch-new-assistant.enabled";
 const DECLARED_SKILL_ID = "hatch-new-assistant";
 
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const realPlatform = require("../util/platform.js");
 mock.module("../util/platform.js", () => ({
+  ...realPlatform,
   getRootDir: () => TEST_DIR,
   getDataDir: () => TEST_DIR,
   getWorkspaceDir: () => TEST_DIR,
@@ -59,38 +62,60 @@ mock.module("../util/platform.js", () => ({
   isWindows: () => false,
   getPlatformName: () => "linux",
   getClipboardCommand: () => null,
+  readSessionToken: () => null,
   removeSocketFile: () => {},
   migratePath: () => {},
   migrateToWorkspaceLayout: () => {},
   migrateToDataLayout: () => {},
 }));
 
+const noopLogger = new Proxy({} as Record<string, unknown>, {
+  get: (_target, prop) => (prop === "child" ? () => noopLogger : () => {}),
+});
+
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const realLogger = require("../util/logger.js");
 mock.module("../util/logger.js", () => ({
-  getLogger: () =>
-    new Proxy({} as Record<string, unknown>, {
-      get: () => () => {},
-    }),
+  ...realLogger,
+  getLogger: () => noopLogger,
+  getCliLogger: () => noopLogger,
   isDebug: () => false,
   truncateForLog: (v: string) => v,
+  initLogger: () => {},
+  pruneOldLogFiles: () => 0,
 }));
 
 mock.module("../config/loader.js", () => ({
   getConfig: () => currentConfig,
+  loadConfig: () => currentConfig,
+  loadRawConfig: () => ({}),
+  saveConfig: () => {},
+  saveRawConfig: () => {},
+  invalidateConfigCache: () => {},
+  getNestedValue: () => undefined,
+  setNestedValue: () => {},
+  syncConfigToLockfile: () => {},
 }));
 
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const realUserReference = require("../config/user-reference.js");
 mock.module("../config/user-reference.js", () => ({
+  ...realUserReference,
   resolveUserReference: () => "TestUser",
   resolveUserPronouns: () => null,
 }));
 
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const realCredentialMetadataStore = require("../tools/credentials/metadata-store.js");
 mock.module("../tools/credentials/metadata-store.js", () => ({
+  ...realCredentialMetadataStore,
   listCredentialMetadata: () => [],
 }));
 
 const { buildSystemPrompt } = await import("../config/system-prompt.js");
 const { isAssistantFeatureFlagEnabled } =
   await import("../config/assistant-feature-flags.js");
-const { isSkillFeatureEnabled } = await import("../config/skill-state.js");
+const { skillFlagKey } = await import("../config/skill-state.js");
 
 // ---------------------------------------------------------------------------
 // Setup / Teardown
@@ -301,18 +326,22 @@ describe("isAssistantFeatureFlagEnabled", () => {
   });
 });
 
-describe("legacy isSkillFeatureEnabled backward compat", () => {
-  test("delegates to the canonical resolver", () => {
+describe("isAssistantFeatureFlagEnabled with skillFlagKey", () => {
+  test("resolves skill flag via canonical path", () => {
     const config = {
       assistantFeatureFlagValues: { [DECLARED_FLAG_KEY]: false },
     } as any;
 
-    expect(isSkillFeatureEnabled(DECLARED_SKILL_ID, config)).toBe(false);
+    expect(
+      isAssistantFeatureFlagEnabled(skillFlagKey(DECLARED_SKILL_ID), config),
+    ).toBe(false);
   });
 
   test("disabled when no override set (registry default is false)", () => {
     const config = {} as any;
 
-    expect(isSkillFeatureEnabled(DECLARED_SKILL_ID, config)).toBe(false);
+    expect(
+      isAssistantFeatureFlagEnabled(skillFlagKey(DECLARED_SKILL_ID), config),
+    ).toBe(false);
   });
 });

package/src/__tests__/assistant-id-boundary-guard.test.ts

@@ -594,6 +594,35 @@ describe("assistant ID boundary", () => {
         match;
         match = exportFnStartRegex.exec(content)
       ) {
+        // Skip matches that fall inside comments. Find the beginning of
+        // the line containing the match and check for comment prefixes.
+        const lineStart = content.lastIndexOf("\n", match.index) + 1;
+        const linePrefix = content.slice(lineStart, match.index).trim();
+        if (linePrefix.startsWith("//")) {
+          continue;
+        }
+        // For block comments: check if the match is inside an unclosed
+        // block comment. A prefix starting with `*` (continuation line)
+        // or `/*` only counts if there is no closing `*/` between the
+        // last `/*` opener and the match position — otherwise the
+        // comment was already closed (e.g. `/** docs */ export …`).
+        if (linePrefix.startsWith("*") || linePrefix.startsWith("/*")) {
+          const textBeforeMatch = content.slice(lineStart, match.index);
+          const lastOpen = textBeforeMatch.lastIndexOf("/*");
+          if (lastOpen === -1) {
+            // No block-comment opener on this line but starts with `*`,
+            // so it's a continuation line inside a multi-line comment.
+            continue;
+          }
+          const closeBetween = textBeforeMatch.indexOf("*/", lastOpen + 2);
+          if (closeBetween === -1) {
+            // The block comment is still open at the match position.
+            continue;
+          }
+          // The block comment was closed before the match — fall through
+          // and evaluate the match normally.
+        }
+
         // Find the matching closing paren to extract the full parameter list,
         // which may span multiple lines.
         const parenStart = match.index + match[0].length - 1; // index of '('

package/src/__tests__/browser-fill-credential.test.ts

@@ -60,7 +60,7 @@ let mockGetCredentialMetadata: ReturnType<typeof mock>;
 mock.module("../security/secure-keys.js", () => ({
   getSecureKey: (...args: unknown[]) => mockGetSecureKey(...args),
   setSecureKey: () => true,
-  deleteSecureKey: () => true,
+  deleteSecureKey: () => "deleted",
   listSecureKeys: () => [],
   getBackendType: () => "encrypted",
   _resetBackend: () => {},

package/src/__tests__/bundle-scanner.test.ts

@@ -49,7 +49,7 @@ async function createBundle(
   const data = await zip.generateAsync({ type: "uint8array" });
   const path = join(
     tempDir,
-    `test-${Date.now()}-${Math.random().toString(36).slice(2)}.vellumapp`,
+    `test-${Date.now()}-${Math.random().toString(36).slice(2)}.vellum`,
   );
   await Bun.write(path, data);
   return path;