@vellumai/assistant 0.6.2 → 0.6.4

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

@@ -0,0 +1,330 @@
+import { beforeEach, describe, expect, mock, test } from "bun:test";
+
+import { Command } from "commander";
+
+// ---------------------------------------------------------------------------
+// Mock state
+// ---------------------------------------------------------------------------
+
+let mockRegisterProvider: (
+  params: Record<string, unknown>,
+) => Record<string, unknown> = () => ({});
+
+let mockRegisterProviderCalls: Array<{
+  params: Record<string, unknown>;
+}> = [];
+
+// ---------------------------------------------------------------------------
+// Mocks
+// ---------------------------------------------------------------------------
+
+mock.module("../../../../config/loader.js", () => ({
+  getConfig: () => ({ services: {} }),
+  loadConfig: () => ({ services: {} }),
+  API_KEY_PROVIDERS: [],
+}));
+
+mock.module("../../../../oauth/oauth-store.js", () => ({
+  getProvider: () => undefined,
+  updateProvider: () => undefined,
+  listProviders: () => [],
+  registerProvider: (params: Record<string, unknown>) => {
+    mockRegisterProviderCalls.push({ params });
+    return mockRegisterProvider(params);
+  },
+  deleteProvider: () => false,
+  disconnectOAuthProvider: async () => "ok",
+  seedProviders: () => {},
+  getConnection: () => undefined,
+  getConnectionByProvider: () => undefined,
+  getActiveConnection: () => undefined,
+  listActiveConnectionsByProvider: () => [],
+  isProviderConnected: () => false,
+  createConnection: () => ({}),
+  updateConnection: () => ({}),
+  deleteConnection: () => false,
+  upsertApp: async () => ({}),
+  getApp: () => undefined,
+  getAppByProviderAndClientId: () => undefined,
+  getMostRecentAppByProvider: () => undefined,
+  listApps: () => [],
+  deleteApp: async () => false,
+  listConnections: () => [],
+}));
+
+mock.module("../../../../oauth/seed-providers.js", () => ({
+  SEEDED_PROVIDER_KEYS: new Set<string>(["google", "slack", "github"]),
+  PROVIDER_SEED_DATA: {},
+  seedAllProviders: () => {},
+}));
+
+mock.module("../../../../inbound/public-ingress-urls.js", () => ({
+  getOAuthCallbackUrl: () => null,
+}));
+
+mock.module("../../../../util/logger.js", () => ({
+  getLogger: () => ({
+    info: () => {},
+    warn: () => {},
+    error: () => {},
+    debug: () => {},
+  }),
+  getCliLogger: () => ({
+    info: () => {},
+    warn: () => {},
+    error: () => {},
+    debug: () => {},
+  }),
+}));
+
+// ---------------------------------------------------------------------------
+// Import module under test (after mocks are registered)
+// ---------------------------------------------------------------------------
+
+const { registerProviderCommands } = await import("../providers.js");
+
+// ---------------------------------------------------------------------------
+// Test helper
+// ---------------------------------------------------------------------------
+
+async function runCommand(
+  args: string[],
+): Promise<{ stdout: string; stderr: string; exitCode: number }> {
+  const originalStdoutWrite = process.stdout.write.bind(process.stdout);
+  const originalStderrWrite = process.stderr.write.bind(process.stderr);
+  const stdoutChunks: string[] = [];
+  const stderrChunks: string[] = [];
+
+  process.stdout.write = ((chunk: unknown) => {
+    stdoutChunks.push(typeof chunk === "string" ? chunk : String(chunk));
+    return true;
+  }) as typeof process.stdout.write;
+
+  process.stderr.write = ((chunk: unknown) => {
+    stderrChunks.push(typeof chunk === "string" ? chunk : String(chunk));
+    return true;
+  }) as typeof process.stderr.write;
+
+  process.exitCode = 0;
+
+  try {
+    const program = new Command();
+    program.exitOverride();
+    program.option("--json", "JSON output");
+    program.configureOutput({
+      writeErr: (str: string) => stderrChunks.push(str),
+      writeOut: (str: string) => stdoutChunks.push(str),
+    });
+    registerProviderCommands(program);
+    await program.parseAsync(["node", "assistant", ...args]);
+  } catch {
+    if (process.exitCode === 0) process.exitCode = 1;
+  } finally {
+    process.stdout.write = originalStdoutWrite;
+    process.stderr.write = originalStderrWrite;
+  }
+
+  const exitCode = process.exitCode ?? 0;
+  process.exitCode = 0;
+
+  return {
+    exitCode,
+    stdout: stdoutChunks.join(""),
+    stderr: stderrChunks.join(""),
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Sample provider row
+// ---------------------------------------------------------------------------
+
+const sampleProviderRow = {
+  provider: "custom-api",
+  authorizeUrl: "https://custom-api.example.com/oauth/authorize",
+  tokenExchangeUrl: "https://custom-api.example.com/oauth/token",
+  refreshUrl: null,
+  tokenEndpointAuthMethod: "client_secret_post",
+  tokenExchangeBodyFormat: "form",
+  userinfoUrl: null,
+  baseUrl: null,
+  defaultScopes: "[]",
+  scopePolicy: "{}",
+  scopeSeparator: null,
+  authorizeParams: null,
+  managedServiceConfigKey: null,
+  pingUrl: null,
+  pingMethod: null,
+  pingHeaders: null,
+  pingBody: null,
+  revokeUrl: null,
+  revokeBodyTemplate: null,
+  displayLabel: null,
+  description: null,
+  dashboardUrl: null,
+  logoUrl: null,
+  clientIdPlaceholder: null,
+  requiresClientSecret: 1,
+  loopbackPort: null,
+  injectionTemplates: null,
+  appType: null,
+  setupNotes: null,
+  identityUrl: null,
+  identityMethod: null,
+  identityHeaders: null,
+  identityBody: null,
+  identityResponsePaths: null,
+  identityFormat: null,
+  identityOkField: null,
+  featureFlag: null,
+  createdAt: Date.now(),
+  updatedAt: Date.now(),
+};
+
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+
+describe("assistant oauth providers register", () => {
+  beforeEach(() => {
+    mockRegisterProvider = () => ({ ...sampleProviderRow });
+    mockRegisterProviderCalls = [];
+    process.exitCode = 0;
+  });
+
+  // -------------------------------------------------------------------------
+  // --logo-url
+  // -------------------------------------------------------------------------
+
+  test("register accepts --logo-url and passes it to registerProvider", async () => {
+    mockRegisterProvider = () => ({
+      ...sampleProviderRow,
+      logoUrl: "https://example.com/logo.png",
+    });
+
+    const { exitCode } = await runCommand([
+      "providers",
+      "register",
+      "--provider-key",
+      "custom-api",
+      "--auth-url",
+      "https://custom-api.example.com/oauth/authorize",
+      "--token-url",
+      "https://custom-api.example.com/oauth/token",
+      "--logo-url",
+      "https://example.com/logo.png",
+      "--json",
+    ]);
+    expect(exitCode).toBe(0);
+    expect(mockRegisterProviderCalls).toHaveLength(1);
+    expect(mockRegisterProviderCalls[0].params.logoUrl).toBe(
+      "https://example.com/logo.png",
+    );
+  });
+
+  // -------------------------------------------------------------------------
+  // --logo-simpleicons-slug
+  // -------------------------------------------------------------------------
+
+  test("register accepts --logo-simpleicons-slug and expands it to the CDN URL", async () => {
+    mockRegisterProvider = () => ({
+      ...sampleProviderRow,
+      logoUrl: "https://cdn.simpleicons.org/notion",
+    });
+
+    const { exitCode } = await runCommand([
+      "providers",
+      "register",
+      "--provider-key",
+      "custom-api",
+      "--auth-url",
+      "https://custom-api.example.com/oauth/authorize",
+      "--token-url",
+      "https://custom-api.example.com/oauth/token",
+      "--logo-simpleicons-slug",
+      "notion",
+      "--json",
+    ]);
+    expect(exitCode).toBe(0);
+    expect(mockRegisterProviderCalls).toHaveLength(1);
+    expect(mockRegisterProviderCalls[0].params.logoUrl).toBe(
+      "https://cdn.simpleicons.org/notion",
+    );
+  });
+
+  // -------------------------------------------------------------------------
+  // Mutual exclusion
+  // -------------------------------------------------------------------------
+
+  test("register rejects both --logo-url and --logo-simpleicons-slug simultaneously", async () => {
+    const { exitCode, stdout } = await runCommand([
+      "providers",
+      "register",
+      "--provider-key",
+      "custom-api",
+      "--auth-url",
+      "https://custom-api.example.com/oauth/authorize",
+      "--token-url",
+      "https://custom-api.example.com/oauth/token",
+      "--logo-url",
+      "https://example.com/logo.png",
+      "--logo-simpleicons-slug",
+      "notion",
+      "--json",
+    ]);
+    expect(exitCode).toBe(1);
+    const parsed = JSON.parse(stdout);
+    expect(parsed.ok).toBe(false);
+    expect(parsed.error).toContain("mutually exclusive");
+    expect(mockRegisterProviderCalls).toHaveLength(0);
+  });
+
+  // -------------------------------------------------------------------------
+  // Empty slug rejection
+  // -------------------------------------------------------------------------
+
+  test("register rejects empty --logo-simpleicons-slug", async () => {
+    const { exitCode, stdout } = await runCommand([
+      "providers",
+      "register",
+      "--provider-key",
+      "custom-api",
+      "--auth-url",
+      "https://custom-api.example.com/oauth/authorize",
+      "--token-url",
+      "https://custom-api.example.com/oauth/token",
+      "--logo-simpleicons-slug",
+      "",
+      "--json",
+    ]);
+    expect(exitCode).toBe(1);
+    const parsed = JSON.parse(stdout);
+    expect(parsed.ok).toBe(false);
+    expect(parsed.error).toContain("cannot be empty");
+    expect(mockRegisterProviderCalls).toHaveLength(0);
+  });
+
+  // -------------------------------------------------------------------------
+  // Empty --logo-url rejection at registration time
+  // -------------------------------------------------------------------------
+
+  test("register rejects empty --logo-url (clearing is only valid at update time)", async () => {
+    const { exitCode, stdout } = await runCommand([
+      "providers",
+      "register",
+      "--provider-key",
+      "custom-api",
+      "--auth-url",
+      "https://custom-api.example.com/oauth/authorize",
+      "--token-url",
+      "https://custom-api.example.com/oauth/token",
+      "--logo-url",
+      "",
+      "--json",
+    ]);
+    expect(exitCode).toBe(1);
+    const parsed = JSON.parse(stdout);
+    expect(parsed.ok).toBe(false);
+    expect(parsed.error).toContain("Cannot clear logo_url");
+    expect(mockRegisterProviderCalls).toHaveLength(0);
+  });
+});

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

@@ -40,6 +40,8 @@ mock.module("../../../../oauth/oauth-store.js", () => ({
   },
   listProviders: () => [],
   registerProvider: () => ({}),
+  deleteProvider: () => false,
+  disconnectOAuthProvider: async () => "ok",
   seedProviders: () => {},
   getConnection: () => undefined,
   getConnectionByProvider: () => undefined,
@@ -137,21 +139,26 @@ async function runCommand(
 // ---------------------------------------------------------------------------
 
 const sampleProviderRow = {
-  providerKey: "custom-api",
-  authUrl: "https://custom-api.example.com/oauth/authorize",
-  tokenUrl: "https://custom-api.example.com/oauth/token",
-  tokenEndpointAuthMethod: null,
+  provider: "custom-api",
+  authorizeUrl: "https://custom-api.example.com/oauth/authorize",
+  tokenExchangeUrl: "https://custom-api.example.com/oauth/token",
+  refreshUrl: null,
+  tokenEndpointAuthMethod: "client_secret_post",
+  tokenExchangeBodyFormat: "form",
   userinfoUrl: null,
   baseUrl: null,
   defaultScopes: "[]",
   scopePolicy: "{}",
-  extraParams: null,
+  scopeSeparator: null,
+  authorizeParams: null,
   managedServiceConfigKey: null,
   pingUrl: null,
   pingMethod: null,
   pingHeaders: null,
   pingBody: null,
-  displayName: null,
+  revokeUrl: null,
+  revokeBodyTemplate: null,
+  displayLabel: null,
   description: null,
   dashboardUrl: null,
   clientIdPlaceholder: null,
@@ -214,7 +221,7 @@ describe("assistant oauth providers update", () => {
   test("built-in provider returns error suggesting register", async () => {
     mockGetProvider = () => ({
       ...sampleProviderRow,
-      providerKey: "google",
+      provider: "google",
     });
 
     const { exitCode, stdout } = await runCommand([
@@ -259,7 +266,7 @@ describe("assistant oauth providers update", () => {
     mockGetProvider = () => ({ ...sampleProviderRow });
     mockUpdateProvider = (_key, _params) => ({
       ...sampleProviderRow,
-      displayName: "New Name",
+      displayLabel: "New Name",
       updatedAt: Date.now(),
     });
 
@@ -285,9 +292,9 @@ describe("assistant oauth providers update", () => {
     mockGetProvider = () => ({ ...sampleProviderRow });
     mockUpdateProvider = (_key, _params) => ({
       ...sampleProviderRow,
-      displayName: "My API",
+      displayLabel: "My API",
       defaultScopes: '["read","write"]',
-      authUrl: "https://new.example.com/auth",
+      authorizeUrl: "https://new.example.com/auth",
       updatedAt: Date.now(),
     });
 
@@ -311,9 +318,9 @@ describe("assistant oauth providers update", () => {
     expect(mockUpdateProviderCalls).toHaveLength(1);
     expect(mockUpdateProviderCalls[0].key).toBe("custom-api");
     expect(mockUpdateProviderCalls[0].params).toEqual({
-      displayName: "My API",
+      displayLabel: "My API",
       defaultScopes: ["read", "write"],
-      authUrl: "https://new.example.com/auth",
+      authorizeUrl: "https://new.example.com/auth",
     });
   });
 
@@ -321,6 +328,104 @@ describe("assistant oauth providers update", () => {
   // Successful update with injection templates, identity config, and setup metadata
   // -------------------------------------------------------------------------
 
+  // -------------------------------------------------------------------------
+  // --logo-url
+  // -------------------------------------------------------------------------
+
+  test("update --logo-url sets params.logoUrl to the given string", async () => {
+    mockGetProvider = () => ({ ...sampleProviderRow });
+    mockUpdateProvider = (_key, _params) => ({
+      ...sampleProviderRow,
+      logoUrl: "https://example.com/logo.png",
+      updatedAt: Date.now(),
+    });
+
+    const { exitCode } = await runCommand([
+      "providers",
+      "update",
+      "custom-api",
+      "--logo-url",
+      "https://example.com/logo.png",
+      "--json",
+    ]);
+    expect(exitCode).toBe(0);
+    expect(mockUpdateProviderCalls).toHaveLength(1);
+    expect(mockUpdateProviderCalls[0].key).toBe("custom-api");
+    expect(mockUpdateProviderCalls[0].params).toEqual({
+      logoUrl: "https://example.com/logo.png",
+    });
+  });
+
+  test("update --logo-simpleicons-slug expands to CDN URL and passes as params.logoUrl", async () => {
+    mockGetProvider = () => ({ ...sampleProviderRow });
+    mockUpdateProvider = (_key, _params) => ({
+      ...sampleProviderRow,
+      logoUrl: "https://cdn.simpleicons.org/notion",
+      updatedAt: Date.now(),
+    });
+
+    const { exitCode } = await runCommand([
+      "providers",
+      "update",
+      "custom-api",
+      "--logo-simpleicons-slug",
+      "notion",
+      "--json",
+    ]);
+    expect(exitCode).toBe(0);
+    expect(mockUpdateProviderCalls).toHaveLength(1);
+    expect(mockUpdateProviderCalls[0].params).toEqual({
+      logoUrl: "https://cdn.simpleicons.org/notion",
+    });
+  });
+
+  test('update --logo-url "" clears params.logoUrl to null', async () => {
+    mockGetProvider = () => ({ ...sampleProviderRow });
+    mockUpdateProvider = (_key, _params) => ({
+      ...sampleProviderRow,
+      logoUrl: null,
+      updatedAt: Date.now(),
+    });
+
+    const { exitCode } = await runCommand([
+      "providers",
+      "update",
+      "custom-api",
+      "--logo-url",
+      "",
+      "--json",
+    ]);
+    expect(exitCode).toBe(0);
+    expect(mockUpdateProviderCalls).toHaveLength(1);
+    expect(mockUpdateProviderCalls[0].params).toEqual({
+      logoUrl: null,
+    });
+  });
+
+  test("update rejects both --logo-url and --logo-simpleicons-slug simultaneously", async () => {
+    mockGetProvider = () => ({ ...sampleProviderRow });
+
+    const { exitCode, stdout } = await runCommand([
+      "providers",
+      "update",
+      "custom-api",
+      "--logo-url",
+      "https://example.com/logo.png",
+      "--logo-simpleicons-slug",
+      "notion",
+      "--json",
+    ]);
+    expect(exitCode).toBe(1);
+    const parsed = JSON.parse(stdout);
+    expect(parsed.ok).toBe(false);
+    expect(parsed.error).toContain("mutually exclusive");
+    expect(mockUpdateProviderCalls).toHaveLength(0);
+  });
+
+  // -------------------------------------------------------------------------
+  // Successful update with injection templates, identity config, and setup metadata
+  // -------------------------------------------------------------------------
+
   test("successful update with injection templates and identity config passes new fields to updateProvider", async () => {
     const injectionTemplates = [
       {

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

@@ -11,7 +11,7 @@ let mockGetProvider: (
 ) => Record<string, unknown> | undefined = () => undefined;
 
 let mockListConnections: (
-  providerKey: string,
+  provider: string,
 ) => Array<Record<string, unknown>> = () => [];
 
 let mockIsManagedMode: (key: string) => boolean = () => false;
@@ -35,7 +35,7 @@ mock.module("../../../../config/loader.js", () => ({
 
 mock.module("../../../../oauth/oauth-store.js", () => ({
   getProvider: (key: string) => mockGetProvider(key),
-  listConnections: (providerKey: string) => mockListConnections(providerKey),
+  listConnections: (provider: string) => mockListConnections(provider),
   getConnection: () => undefined,
   getConnectionByProvider: () => undefined,
   getActiveConnection: () => undefined,
@@ -235,7 +235,7 @@ describe("assistant oauth status", () => {
   describe("managed mode", () => {
     beforeEach(() => {
       mockGetProvider = () => ({
-        providerKey: "google",
+        provider: "google",
         managedServiceConfigKey: "google-oauth",
       });
       mockIsManagedMode = () => true;
@@ -360,7 +360,7 @@ describe("assistant oauth status", () => {
   describe("BYO mode", () => {
     beforeEach(() => {
       mockGetProvider = () => ({
-        providerKey: "google",
+        provider: "google",
         managedServiceConfigKey: null,
       });
       mockIsManagedMode = () => false;
@@ -371,7 +371,7 @@ describe("assistant oauth status", () => {
       mockListConnections = () => [
         {
           id: "conn-local-1",
-          providerKey: "google",
+          provider: "google",
           accountInfo: "localuser@gmail.com",
           grantedScopes: '["email","profile"]',
           expiresAt,
@@ -405,7 +405,7 @@ describe("assistant oauth status", () => {
       mockListConnections = () => [
         {
           id: "conn-local-2",
-          providerKey: "google",
+          provider: "google",
           accountInfo: null,
           grantedScopes: "[]",
           expiresAt: null,
@@ -432,7 +432,7 @@ describe("assistant oauth status", () => {
       mockListConnections = () => [
         {
           id: "conn-active",
-          providerKey: "google",
+          provider: "google",
           accountInfo: "user@gmail.com",
           grantedScopes: "[]",
           expiresAt: null,
@@ -441,7 +441,7 @@ describe("assistant oauth status", () => {
         },
         {
           id: "conn-revoked",
-          providerKey: "google",
+          provider: "google",
           accountInfo: "old@gmail.com",
           grantedScopes: "[]",
           expiresAt: null,
@@ -489,7 +489,7 @@ describe("assistant oauth status", () => {
       mockListConnections = () => [
         {
           id: "conn-structure",
-          providerKey: "google",
+          provider: "google",
           accountInfo: "check@gmail.com",
           grantedScopes: '["scope1"]',
           expiresAt: Date.now() + 60_000,
@@ -527,7 +527,7 @@ describe("assistant oauth status", () => {
       mockListConnections = () => [
         {
           id: "conn-bad-scopes",
-          providerKey: "google",
+          provider: "google",
           accountInfo: null,
           grantedScopes: "not-valid-json",
           expiresAt: null,

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

@@ -9,7 +9,7 @@ import { Command } from "commander";
 let mockIsManagedMode: (key: string) => boolean = () => false;
 
 let mockGetActiveConnection: (
-  providerKey: string,
+  provider: string,
   options?: { clientId?: string; account?: string },
 ) => Record<string, unknown> | undefined = () => undefined;
 
@@ -34,9 +34,9 @@ mock.module("../../../../oauth/oauth-store.js", () => ({
   getConnection: () => undefined,
   getConnectionByProvider: () => undefined,
   getActiveConnection: (
-    providerKey: string,
+    provider: string,
     options?: { clientId?: string; account?: string },
-  ) => mockGetActiveConnection(providerKey, options),
+  ) => mockGetActiveConnection(provider, options),
   listActiveConnectionsByProvider: () => [],
   disconnectOAuthProvider: async () => "not-found" as const,
   upsertApp: async () => ({}),
@@ -265,11 +265,11 @@ describe("assistant oauth token", () => {
 
   describe("--account option", () => {
     test("resolves connection by account and uses connectionId", async () => {
-      mockGetActiveConnection = (_providerKey, options) => {
+      mockGetActiveConnection = (_provider, options) => {
         if (options?.account === "user@gmail.com") {
           return {
             id: "conn-abc-123",
-            providerKey: "google",
+            provider: "google",
             accountInfo: "user@gmail.com",
             status: "active",
           };
@@ -322,11 +322,11 @@ describe("assistant oauth token", () => {
 
   describe("--client-id option", () => {
     test("resolves connection by client-id and uses connectionId", async () => {
-      mockGetActiveConnection = (_providerKey, options) => {
+      mockGetActiveConnection = (_provider, options) => {
         if (options?.clientId === "my-client-id") {
           return {
             id: "conn-client-456",
-            providerKey: "google",
+            provider: "google",
             accountInfo: null,
             status: "active",
           };

package/src/cli/commands/oauth/apps.ts

@@ -41,14 +41,17 @@ const log = getCliLogger("cli");
 /** Format an app row for output, converting timestamps to ISO strings. */
 function formatAppRow(row: {
   id: string;
-  providerKey: string;
+  provider: string;
   clientId: string;
   createdAt: number;
   updatedAt: number;
 }) {
   return {
     id: row.id,
-    providerKey: row.providerKey,
+    // Wire key stays `providerKey` for backward compatibility with existing
+    // CLI script consumers of `assistant oauth apps list/get/upsert --json`;
+    // the internal Drizzle TS-side field is `provider`.
+    providerKey: row.provider,
     clientId: row.clientId,
     createdAt: new Date(row.createdAt).toISOString(),
     updatedAt: new Date(row.updatedAt).toISOString(),
@@ -94,7 +97,7 @@ Examples:
 Returns registered OAuth apps with their provider key, client ID, and
 timestamps. Output is an array of app objects.
 
-When --provider-key is specified, only apps whose providerKey exactly matches
+When --provider-key is specified, only apps whose provider exactly matches
 the given value are returned. Without the flag, all apps are listed.
 
 In JSON mode (--json), returns the array directly. In human mode, logs a
@@ -288,7 +291,7 @@ Examples:
           );
 
           if (!shouldOutputJson(cmd)) {
-            log.info(`Upserted app: ${row.id} (provider: ${row.providerKey})`);
+            log.info(`Upserted app: ${row.id} (provider: ${row.provider})`);
           }
 
           writeOutput(cmd, formatAppRow(row));