@vellumai/assistant 0.6.1 → 0.6.3

package/src/cli/commands/oauth/__tests__/mode.test.ts

@@ -11,7 +11,7 @@ let mockGetProvider: (
 ) => Record<string, unknown> | undefined = () => undefined;
 
 let mockListActiveConnectionsByProvider: (
-  providerKey: string,
+  provider: string,
 ) => Array<Record<string, unknown>> = () => [];
 
 let mockGetManagedServiceConfigKey: (key: string) => string | null = () => null;
@@ -71,8 +71,8 @@ mock.module("../../../../config/loader.js", () => ({
 
 mock.module("../../../../oauth/oauth-store.js", () => ({
   getProvider: (key: string) => mockGetProvider(key),
-  listActiveConnectionsByProvider: (providerKey: string) =>
-    mockListActiveConnectionsByProvider(providerKey),
+  listActiveConnectionsByProvider: (provider: string) =>
+    mockListActiveConnectionsByProvider(provider),
   listConnections: () => [],
   getConnection: () => undefined,
   getConnectionByProvider: () => undefined,
@@ -276,7 +276,7 @@ describe("assistant oauth mode", () => {
 
     test("provider without managedServiceConfigKey returns your-own with managedModeSupported: false", async () => {
       mockGetProvider = () => ({
-        providerKey: "slack",
+        provider: "slack",
         managedServiceConfigKey: null,
       });
       mockGetManagedServiceConfigKey = () => null;
@@ -296,7 +296,7 @@ describe("assistant oauth mode", () => {
 
     test("provider in managed mode returns mode: managed with managedModeSupported: true", async () => {
       mockGetProvider = () => ({
-        providerKey: "google",
+        provider: "google",
         managedServiceConfigKey: "google-oauth",
       });
       mockGetManagedServiceConfigKey = () => "google-oauth";
@@ -319,7 +319,7 @@ describe("assistant oauth mode", () => {
 
     test("provider in your-own mode returns mode: your-own with managedModeSupported: true", async () => {
       mockGetProvider = () => ({
-        providerKey: "google",
+        provider: "google",
         managedServiceConfigKey: "google-oauth",
       });
       mockGetManagedServiceConfigKey = () => "google-oauth";
@@ -348,7 +348,7 @@ describe("assistant oauth mode", () => {
   describe("set mode", () => {
     test("invalid mode value returns error listing valid values", async () => {
       mockGetProvider = () => ({
-        providerKey: "google",
+        provider: "google",
         managedServiceConfigKey: "google-oauth",
       });
       mockGetManagedServiceConfigKey = () => "google-oauth";
@@ -370,7 +370,7 @@ describe("assistant oauth mode", () => {
 
     test("provider without managedServiceConfigKey returns error about managed mode not available when --set managed", async () => {
       mockGetProvider = () => ({
-        providerKey: "slack",
+        provider: "slack",
         managedServiceConfigKey: null,
       });
       mockGetManagedServiceConfigKey = () => null;
@@ -391,7 +391,7 @@ describe("assistant oauth mode", () => {
 
     test("provider without managedServiceConfigKey treats --set your-own as successful no-op", async () => {
       mockGetProvider = () => ({
-        providerKey: "slack",
+        provider: "slack",
         managedServiceConfigKey: null,
       });
       mockGetManagedServiceConfigKey = () => null;
@@ -414,7 +414,7 @@ describe("assistant oauth mode", () => {
 
     test("set to same mode returns changed: false", async () => {
       mockGetProvider = () => ({
-        providerKey: "google",
+        provider: "google",
         managedServiceConfigKey: "google-oauth",
       });
       mockGetManagedServiceConfigKey = () => "google-oauth";
@@ -440,7 +440,7 @@ describe("assistant oauth mode", () => {
 
     test("switch managed -> your-own with active managed connections and no BYO connections includes hint", async () => {
       mockGetProvider = () => ({
-        providerKey: "google",
+        provider: "google",
         managedServiceConfigKey: "google-oauth",
       });
       mockGetManagedServiceConfigKey = () => "google-oauth";
@@ -483,7 +483,7 @@ describe("assistant oauth mode", () => {
 
     test("switch your-own -> managed with active BYO connections and no managed connections includes hint", async () => {
       mockGetProvider = () => ({
-        providerKey: "google",
+        provider: "google",
         managedServiceConfigKey: "google-oauth",
       });
       mockGetManagedServiceConfigKey = () => "google-oauth";
@@ -496,7 +496,7 @@ describe("assistant oauth mode", () => {
       mockListActiveConnectionsByProvider = () => [
         {
           id: "conn-local-1",
-          providerKey: "google",
+          provider: "google",
           status: "active",
         },
       ];
@@ -526,7 +526,7 @@ describe("assistant oauth mode", () => {
 
     test("switch mode with connections on both sides has no hint", async () => {
       mockGetProvider = () => ({
-        providerKey: "google",
+        provider: "google",
         managedServiceConfigKey: "google-oauth",
       });
       mockGetManagedServiceConfigKey = () => "google-oauth";
@@ -549,7 +549,7 @@ describe("assistant oauth mode", () => {
       mockListActiveConnectionsByProvider = () => [
         {
           id: "conn-local-1",
-          providerKey: "google",
+          provider: "google",
           status: "active",
         },
       ];
@@ -571,7 +571,7 @@ describe("assistant oauth mode", () => {
 
     test("switch mode with no connections on either side has no hint", async () => {
       mockGetProvider = () => ({
-        providerKey: "google",
+        provider: "google",
         managedServiceConfigKey: "google-oauth",
       });
       mockGetManagedServiceConfigKey = () => "google-oauth";
@@ -604,7 +604,7 @@ describe("assistant oauth mode", () => {
 
     test("saveRawConfig is called with the correct nested path", async () => {
       mockGetProvider = () => ({
-        providerKey: "google",
+        provider: "google",
         managedServiceConfigKey: "google-oauth",
       });
       mockGetManagedServiceConfigKey = () => "google-oauth";

package/src/cli/commands/oauth/__tests__/ping.test.ts

@@ -15,7 +15,7 @@ let mockResolveOAuthConnectionResult:
   | Error = new Error("not configured");
 
 let mockResolveOAuthConnectionCalls: Array<{
-  providerKey: string;
+  provider: string;
   options?: Record<string, unknown>;
 }> = [];
 
@@ -53,10 +53,10 @@ mock.module("../../../../oauth/oauth-store.js", () => ({
 
 mock.module("../../../../oauth/connection-resolver.js", () => ({
   resolveOAuthConnection: async (
-    providerKey: string,
+    provider: string,
     options?: Record<string, unknown>,
   ) => {
-    mockResolveOAuthConnectionCalls.push({ providerKey, options });
+    mockResolveOAuthConnectionCalls.push({ provider, options });
     if (mockResolveOAuthConnectionResult instanceof Error) {
       throw mockResolveOAuthConnectionResult;
     }
@@ -186,7 +186,7 @@ describe("assistant oauth ping", () => {
 
   test("no ping URL configured returns error", async () => {
     mockGetProvider = () => ({
-      providerKey: "google",
+      provider: "google",
       pingUrl: null,
     });
 
@@ -205,7 +205,7 @@ describe("assistant oauth ping", () => {
   describe("BYO mode", () => {
     beforeEach(() => {
       mockGetProvider = () => ({
-        providerKey: "google",
+        provider: "google",
         pingUrl: "https://www.googleapis.com/oauth2/v1/tokeninfo",
         managedServiceConfigKey: null,
       });
@@ -307,7 +307,7 @@ describe("assistant oauth ping", () => {
   describe("managed mode", () => {
     beforeEach(() => {
       mockGetProvider = () => ({
-        providerKey: "google",
+        provider: "google",
         pingUrl: "https://www.googleapis.com/oauth2/v1/tokeninfo",
         managedServiceConfigKey: "google-oauth",
       });
@@ -363,7 +363,7 @@ describe("assistant oauth ping", () => {
 
   test("connection resolution failure (no active connection) with recovery hint", async () => {
     mockGetProvider = () => ({
-      providerKey: "google",
+      provider: "google",
       pingUrl: "https://www.googleapis.com/oauth2/v1/tokeninfo",
     });
 
@@ -386,7 +386,7 @@ describe("assistant oauth ping", () => {
 
   test("--account option passed through to connection resolution", async () => {
     mockGetProvider = () => ({
-      providerKey: "google",
+      provider: "google",
       pingUrl: "https://www.googleapis.com/oauth2/v1/tokeninfo",
     });
 
@@ -419,7 +419,7 @@ describe("assistant oauth ping", () => {
 
   test("--client-id option passed through to connection resolution", async () => {
     mockGetProvider = () => ({
-      providerKey: "google",
+      provider: "google",
       pingUrl: "https://www.googleapis.com/oauth2/v1/tokeninfo",
     });
 
@@ -452,7 +452,7 @@ describe("assistant oauth ping", () => {
 
   test("JSON output mode returns structured response", async () => {
     mockGetProvider = () => ({
-      providerKey: "google",
+      provider: "google",
       pingUrl: "https://www.googleapis.com/oauth2/v1/tokeninfo",
     });
 
@@ -480,7 +480,7 @@ describe("assistant oauth ping", () => {
 
   test("human output mode logs to stderr on success", async () => {
     mockGetProvider = () => ({
-      providerKey: "google",
+      provider: "google",
       pingUrl: "https://www.googleapis.com/oauth2/v1/tokeninfo",
     });
 
@@ -508,7 +508,7 @@ describe("assistant oauth ping", () => {
 
   test("uses configured pingMethod for POST providers", async () => {
     mockGetProvider = () => ({
-      providerKey: "dropbox",
+      provider: "dropbox",
       pingUrl: "https://api.dropboxapi.com/2/users/get_current_account",
       pingMethod: "POST",
       pingHeaders: null,
@@ -530,7 +530,7 @@ describe("assistant oauth ping", () => {
 
   test("uses configured pingHeaders", async () => {
     mockGetProvider = () => ({
-      providerKey: "notion",
+      provider: "notion",
       pingUrl: "https://api.notion.com/v1/users/me",
       pingMethod: null,
       pingHeaders: '{"Notion-Version":"2022-06-28"}',
@@ -554,7 +554,7 @@ describe("assistant oauth ping", () => {
 
   test("uses configured pingBody for GraphQL providers", async () => {
     mockGetProvider = () => ({
-      providerKey: "linear",
+      provider: "linear",
       pingUrl: "https://api.linear.app/graphql",
       pingMethod: "POST",
       pingHeaders: '{"Content-Type":"application/json"}',
@@ -582,7 +582,7 @@ describe("assistant oauth ping", () => {
 
   test("defaults to GET with no extra headers/body when ping config is null", async () => {
     mockGetProvider = () => ({
-      providerKey: "google",
+      provider: "google",
       pingUrl: "https://www.googleapis.com/oauth2/v1/tokeninfo",
       pingMethod: null,
       pingHeaders: null,
@@ -610,7 +610,7 @@ describe("assistant oauth ping", () => {
 
   test("network failure returns error with recovery hint", async () => {
     mockGetProvider = () => ({
-      providerKey: "google",
+      provider: "google",
       pingUrl: "https://www.googleapis.com/oauth2/v1/tokeninfo",
     });
 

package/src/cli/commands/oauth/__tests__/providers-delete.test.ts

@@ -20,7 +20,7 @@ let mockDeleteAppCalls: string[] = [];
 let mockDeleteAppResult = true;
 
 let mockDisconnectCalls: Array<{
-  providerKey: string;
+  provider: string;
   clientId: string | undefined;
   connectionId: string | undefined;
 }> = [];
@@ -47,11 +47,9 @@ mock.module("../../../../oauth/oauth-store.js", () => ({
   getProvider: (key: string) => mockGetProvider(key),
   deleteProvider: () => mockDeleteProviderResult,
   listApps: () => mockListAppsResult,
-  listConnections: (providerKey?: string) => {
-    if (providerKey) {
-      return mockListConnectionsResult.filter(
-        (c) => c.providerKey === providerKey,
-      );
+  listConnections: (provider?: string) => {
+    if (provider) {
+      return mockListConnectionsResult.filter((c) => c.provider === provider);
     }
     return mockListConnectionsResult;
   },
@@ -60,11 +58,11 @@ mock.module("../../../../oauth/oauth-store.js", () => ({
     return mockDeleteAppResult;
   },
   disconnectOAuthProvider: async (
-    providerKey: string,
+    provider: string,
     clientId?: string,
     connectionId?: string,
   ) => {
-    mockDisconnectCalls.push({ providerKey, clientId, connectionId });
+    mockDisconnectCalls.push({ provider, clientId, connectionId });
     return mockDisconnectResult;
   },
   listProviders: () => [],
@@ -210,20 +208,20 @@ describe("assistant oauth providers delete", () => {
   test("provider with dependents and no --force returns exit code 1 with counts", async () => {
     mockGetProvider = (key) =>
       key === "custom-api"
-        ? { providerKey: "custom-api", authUrl: "https://example.com/auth" }
+        ? { provider: "custom-api", authorizeUrl: "https://example.com/auth" }
         : undefined;
 
     mockListAppsResult = [
       {
         id: "app-1",
-        providerKey: "custom-api",
+        provider: "custom-api",
         clientId: "c1",
         createdAt: Date.now(),
         updatedAt: Date.now(),
       },
       {
         id: "app-2",
-        providerKey: "custom-api",
+        provider: "custom-api",
         clientId: "c2",
         createdAt: Date.now(),
         updatedAt: Date.now(),
@@ -233,19 +231,19 @@ describe("assistant oauth providers delete", () => {
     mockListConnectionsResult = [
       {
         id: "conn-1",
-        providerKey: "custom-api",
+        provider: "custom-api",
         oauthAppId: "app-1",
         status: "active",
       },
       {
         id: "conn-2",
-        providerKey: "custom-api",
+        provider: "custom-api",
         oauthAppId: "app-1",
         status: "active",
       },
       {
         id: "conn-3",
-        providerKey: "custom-api",
+        provider: "custom-api",
         oauthAppId: "app-2",
         status: "active",
       },
@@ -272,13 +270,13 @@ describe("assistant oauth providers delete", () => {
   test("provider with dependents and --force cascades deletion and returns summary", async () => {
     mockGetProvider = (key) =>
       key === "custom-api"
-        ? { providerKey: "custom-api", authUrl: "https://example.com/auth" }
+        ? { provider: "custom-api", authorizeUrl: "https://example.com/auth" }
         : undefined;
 
     mockListAppsResult = [
       {
         id: "app-1",
-        providerKey: "custom-api",
+        provider: "custom-api",
         clientId: "c1",
         clientSecretCredentialPath: "cred/app-1",
         createdAt: Date.now(),
@@ -286,7 +284,7 @@ describe("assistant oauth providers delete", () => {
       },
       {
         id: "app-other",
-        providerKey: "other-provider",
+        provider: "other-provider",
         clientId: "c3",
         clientSecretCredentialPath: "cred/app-other",
         createdAt: Date.now(),
@@ -297,13 +295,13 @@ describe("assistant oauth providers delete", () => {
     mockListConnectionsResult = [
       {
         id: "conn-1",
-        providerKey: "custom-api",
+        provider: "custom-api",
         oauthAppId: "app-1",
         status: "active",
       },
       {
         id: "conn-2",
-        providerKey: "custom-api",
+        provider: "custom-api",
         oauthAppId: "app-1",
         status: "active",
       },
@@ -326,12 +324,12 @@ describe("assistant oauth providers delete", () => {
     // Verify disconnectOAuthProvider was called for each connection
     expect(mockDisconnectCalls).toEqual([
       {
-        providerKey: "custom-api",
+        provider: "custom-api",
         clientId: undefined,
         connectionId: "conn-1",
       },
       {
-        providerKey: "custom-api",
+        provider: "custom-api",
         clientId: undefined,
         connectionId: "conn-2",
       },
@@ -348,7 +346,7 @@ describe("assistant oauth providers delete", () => {
   test("provider with no dependents and no --force deletes cleanly", async () => {
     mockGetProvider = (key) =>
       key === "custom-api"
-        ? { providerKey: "custom-api", authUrl: "https://example.com/auth" }
+        ? { provider: "custom-api", authorizeUrl: "https://example.com/auth" }
         : undefined;
 
     mockListAppsResult = [];
@@ -379,13 +377,13 @@ describe("assistant oauth providers delete", () => {
   test("built-in provider with --force succeeds and logs warning about re-creation", async () => {
     mockGetProvider = (key) =>
       key === "google"
-        ? { providerKey: "google", authUrl: "https://accounts.google.com" }
+        ? { provider: "google", authorizeUrl: "https://accounts.google.com" }
         : undefined;
 
     mockListAppsResult = [
       {
         id: "app-g",
-        providerKey: "google",
+        provider: "google",
         clientId: "goog-client",
         clientSecretCredentialPath: "cred/app-g",
         createdAt: Date.now(),
@@ -396,7 +394,7 @@ describe("assistant oauth providers delete", () => {
     mockListConnectionsResult = [
       {
         id: "conn-g",
-        providerKey: "google",
+        provider: "google",
         oauthAppId: "app-g",
         status: "active",
       },
@@ -430,7 +428,7 @@ describe("assistant oauth providers delete", () => {
   test("built-in provider without --force and no dependents logs warning and deletes", async () => {
     mockGetProvider = (key) =>
       key === "google"
-        ? { providerKey: "google", authUrl: "https://accounts.google.com" }
+        ? { provider: "google", authorizeUrl: "https://accounts.google.com" }
         : undefined;
 
     mockListAppsResult = [];
@@ -461,13 +459,13 @@ describe("assistant oauth providers delete", () => {
   test("token cleanup error logs warning but continues cascade delete", async () => {
     mockGetProvider = (key) =>
       key === "custom-api"
-        ? { providerKey: "custom-api", authUrl: "https://example.com/auth" }
+        ? { provider: "custom-api", authorizeUrl: "https://example.com/auth" }
         : undefined;
 
     mockListAppsResult = [
       {
         id: "app-1",
-        providerKey: "custom-api",
+        provider: "custom-api",
         clientId: "c1",
         createdAt: Date.now(),
         updatedAt: Date.now(),
@@ -477,7 +475,7 @@ describe("assistant oauth providers delete", () => {
     mockListConnectionsResult = [
       {
         id: "conn-1",
-        providerKey: "custom-api",
+        provider: "custom-api",
         oauthAppId: "app-1",
         status: "active",
       },
@@ -518,13 +516,13 @@ describe("assistant oauth providers delete", () => {
   test("token cleanup error calls deleteConnection as fallback to avoid FK violation", async () => {
     mockGetProvider = (key) =>
       key === "custom-api"
-        ? { providerKey: "custom-api", authUrl: "https://example.com/auth" }
+        ? { provider: "custom-api", authorizeUrl: "https://example.com/auth" }
         : undefined;
 
     mockListAppsResult = [
       {
         id: "app-1",
-        providerKey: "custom-api",
+        provider: "custom-api",
         clientId: "c1",
         createdAt: Date.now(),
         updatedAt: Date.now(),
@@ -534,13 +532,13 @@ describe("assistant oauth providers delete", () => {
     mockListConnectionsResult = [
       {
         id: "conn-1",
-        providerKey: "custom-api",
+        provider: "custom-api",
         oauthAppId: "app-1",
         status: "active",
       },
       {
         id: "conn-2",
-        providerKey: "custom-api",
+        provider: "custom-api",
         oauthAppId: "app-1",
         status: "active",
       },