@andocorp/cli 0.1.0 → 0.1.2

package/src/client.test.ts

@@ -1,235 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-import { createMe, createMessage } from "./test-helpers.js";
-
-const clientMocks = vi.hoisted(() => {
-  return {
-    action: vi.fn(),
-    constructor: vi.fn(),
-    mutation: vi.fn(),
-    query: vi.fn(),
-    setAuth: vi.fn(),
-  };
-});
-
-vi.mock("convex/browser", () => {
-  return {
-    ConvexHttpClient: class {
-      constructor(...args: unknown[]) {
-        clientMocks.constructor(...args);
-      }
-
-      action = clientMocks.action;
-      mutation = clientMocks.mutation;
-      query = clientMocks.query;
-      setAuth = clientMocks.setAuth;
-    },
-  };
-});
-
-vi.mock("../../convex/convex/_generated/api.js", () => {
-  return {
-    api: {
-      app: {
-        bootstrap: "bootstrap",
-        createMessage: "createMessage",
-        createReaction: "createReaction",
-        getMessage: "getMessage",
-        listConversationMessagesPaginated: "listConversationMessagesPaginated",
-        listThreadReplies: "listThreadReplies",
-      },
-      auth: {
-        discoverWorkspaces: "discoverWorkspaces",
-        refreshSessionJwt: "refreshSessionJwt",
-        selectWorkspace: "selectWorkspace",
-        sendEmailOtp: "sendEmailOtp",
-      },
-    },
-  };
-});
-
-describe("createAndoCliClient", () => {
-  beforeEach(() => {
-    clientMocks.action.mockReset();
-    clientMocks.constructor.mockReset();
-    clientMocks.mutation.mockReset();
-    clientMocks.query.mockReset();
-    clientMocks.setAuth.mockReset();
-  });
-
-  it("loads me from bootstrap", async () => {
-    const { createAndoCliClient } = await import("./client.js");
-    clientMocks.query.mockResolvedValue({
-      me: createMe({
-        created_at: 1_700_000_000_000 as unknown as Date,
-      }),
-      memberships: [],
-    });
-
-    const client = createAndoCliClient({
-      convexUrl: "https://convex.example.com",
-      sessionToken: "session-token",
-    });
-    const me = await client.getMe();
-
-    expect(clientMocks.setAuth).toHaveBeenCalledWith("session-token");
-    expect(clientMocks.query).toHaveBeenCalledWith("bootstrap", {});
-    expect(me?.workspace.name).toBe("Ando");
-    expect(me?.created_at).toBeInstanceOf(Date);
-  });
-
-  it("reuses the bootstrap result across me and memberships", async () => {
-    const { createAndoCliClient } = await import("./client.js");
-    clientMocks.query.mockResolvedValue({
-      me: createMe(),
-      memberships: [],
-    });
-
-    const client = createAndoCliClient({
-      convexUrl: "https://convex.example.com",
-      sessionToken: "session-token",
-    });
-
-    await client.getMe();
-    await client.getAllMemberships();
-
-    expect(clientMocks.query).toHaveBeenCalledTimes(1);
-    expect(clientMocks.query).toHaveBeenCalledWith("bootstrap", {});
-  });
-
-  it("constructs the authenticated Convex client once per CLI client", async () => {
-    const { createAndoCliClient } = await import("./client.js");
-    clientMocks.query
-      .mockResolvedValueOnce({
-        me: createMe(),
-        memberships: [],
-      })
-      .mockResolvedValueOnce({
-        page: [],
-        isDone: true,
-        continueCursor: "",
-      });
-
-    const client = createAndoCliClient({
-      convexUrl: "https://convex.example.com",
-      sessionToken: "session-token",
-    });
-
-    await client.getMe();
-    await client.getConversationMessages("conversation-1", 10);
-
-    expect(clientMocks.constructor).toHaveBeenCalledTimes(2);
-    expect(clientMocks.constructor).toHaveBeenNthCalledWith(
-      1,
-      "https://convex.example.com"
-    );
-    expect(clientMocks.constructor).toHaveBeenNthCalledWith(
-      2,
-      "https://convex.example.com"
-    );
-    expect(clientMocks.setAuth).toHaveBeenCalledTimes(1);
-    expect(clientMocks.setAuth).toHaveBeenCalledWith("session-token");
-  });
-
-  it("reverses paginated message results", async () => {
-    const { createAndoCliClient } = await import("./client.js");
-    clientMocks.query.mockResolvedValue({
-      page: [
-        createMessage({ id: "message-3", created_at: 3 as unknown as Date }),
-        createMessage({ id: "message-2", created_at: 2 as unknown as Date }),
-        createMessage({ id: "message-1", created_at: 1 as unknown as Date }),
-      ],
-      isDone: false,
-      continueCursor: "cursor-2",
-    });
-
-    const client = createAndoCliClient({
-      convexUrl: "https://convex.example.com",
-      sessionToken: "session-token",
-    });
-    const page = await client.getConversationMessages("conversation-1", 10);
-
-    expect(clientMocks.query).toHaveBeenCalledWith(
-      "listConversationMessagesPaginated",
-      {
-        conversationId: "conversation-1",
-        paginationOpts: {
-          cursor: null,
-          numItems: 10,
-        },
-      }
-    );
-    expect(page.items.map((item) => item.id)).toEqual([
-      "message-1",
-      "message-2",
-      "message-3",
-    ]);
-    expect(page.cursor).toBe("cursor-2");
-  });
-
-  it("posts a message with the Convex mutation payload the web app expects", async () => {
-    const { createAndoCliClient } = await import("./client.js");
-    clientMocks.mutation.mockResolvedValue(createMessage());
-
-    const client = createAndoCliClient({
-      convexUrl: "https://convex.example.com",
-      sessionToken: "session-token",
-    });
-
-    await client.postMessage({
-      conversationId: "conversation-1",
-      markdownContent: "hello",
-      threadRootId: "message-root",
-    });
-
-    expect(clientMocks.mutation).toHaveBeenCalledWith("createMessage", {
-      conversationId: "conversation-1",
-      clientRequestId: null,
-      markdownContent: "hello",
-      explicitContextMessageIds: [],
-      imageUrls: [],
-      fileIds: [],
-      initiatorId: null,
-      suppressedLinkPreviewUrls: [],
-      callRootId: null,
-      threadRootMessageId: "message-root",
-    });
-  });
-
-  it("adapts discovered workspaces returned by auth discovery", async () => {
-    const { createAndoCliClient } = await import("./client.js");
-    clientMocks.action.mockResolvedValue({
-      success: true,
-      workspaces: [
-        {
-          id: "workspace-1",
-          stytch_organization_id: "org-1",
-          name: "Ando",
-          slug: "ando",
-          image_url: null,
-          icon_image_file_id: null,
-          description: null,
-          invite_link_id: "invite-1",
-          created_at: 1_700_000_000_000,
-          updated_at: 1_700_000_000_000,
-          member_count: 3,
-        },
-      ],
-      intermediate_session_token: "intermediate-token",
-      requires_workspace_creation: false,
-    });
-
-    const client = createAndoCliClient({
-      convexUrl: "https://convex.example.com",
-    });
-    const discovery = await client.discoverWorkspaces({
-      email: "alex@ando.so",
-      code: "123456",
-    });
-
-    expect(clientMocks.action).toHaveBeenCalledWith("discoverWorkspaces", {
-      email: "alex@ando.so",
-      code: "123456",
-    });
-    expect(discovery.workspaces[0]?.created_at).toBeInstanceOf(Date);
-  });
-});

package/src/client.ts

@@ -1,378 +0,0 @@
-import { ConvexHttpClient, ConvexClient } from "convex/browser";
-import { api } from "../../convex/convex/_generated/api.js";
-import * as Shared from "@ando/shared";
-import {
-  adaptBootstrap,
-  adaptConversationPage,
-  adaptDiscoveredWorkspace,
-  adaptMessage,
-} from "./adapters.js";
-import {
-  CliConfig,
-  ConversationPage,
-  DiscoveredWorkspace,
-  Me,
-  Membership,
-  Message,
-} from "./types.js";
-
-type AuthSessionResponse = {
-  session_jwt: string | null;
-};
-
-type BootstrapQueryResult = {
-  me: Record<string, unknown> | null;
-  memberships: Record<string, unknown>[];
-};
-
-type ConversationMessagesQueryResult = {
-  page: Shared.Contracts.ConversationMessageExtended[];
-  isDone: boolean;
-  continueCursor: string;
-};
-
-type AndoCliClient = {
-  addReaction: (
-    messageId: string,
-    emoji: string
-  ) => Promise<Shared.Contracts.CreateMessageReactionResponse>;
-  createAuthenticatedCopy: (sessionToken: string) => AndoCliClient;
-  discoverWorkspaces: (
-    body: Shared.Contracts.DiscoverWorkspacesBody
-  ) => Promise<{
-    success: boolean;
-    workspaces: DiscoveredWorkspace[];
-    intermediate_session_token: string;
-    requires_workspace_creation: boolean;
-  }>;
-  getAllMemberships: () => Promise<Membership[]>;
-  getConversationMessages: (
-    conversationId: string,
-    limit?: number
-  ) => Promise<ConversationPage>;
-  getConversationMessagesPage: (params: {
-    conversationId: string;
-    cursor?: string | null;
-    limit?: number;
-  }) => Promise<ConversationPage>;
-  getMe: () => Promise<Me | null>;
-  getMessage: (messageId: string) => Promise<Message | null>;
-  getThreadReplies: (messageId: string) => Promise<Message[]>;
-  postMessage: (params: {
-    conversationId: string;
-    markdownContent: string;
-    threadRootId?: string | null;
-  }) => Promise<Message>;
-  refreshSessionJwt: (sessionToken: string) => Promise<string | null>;
-  selectWorkspace: (
-    body: Shared.Contracts.SelectWorkspaceBody
-  ) => Promise<Shared.Contracts.SelectWorkspaceResponse>;
-  sendEmailOtp: (
-    body: Shared.Contracts.SendEmailOtpBody
-  ) => Promise<Shared.Contracts.SendEmailOtpSuccessResponse>;
-  subscribeToConversationMessages: (params: {
-    conversationId: string;
-    limit?: number;
-    onUpdate: (page: ConversationPage) => void;
-  }) => () => void;
-  subscribeToThreadReplies: (params: {
-    threadRootId: string;
-    onUpdate: (replies: Message[]) => void;
-  }) => () => void;
-  close: () => Promise<void>;
-};
-
-function createConvexHttpClient(convexUrl: string, sessionToken?: string) {
-  const client = new ConvexHttpClient(convexUrl);
-  if (typeof sessionToken === "string" && sessionToken.length > 0) {
-    client.setAuth(sessionToken);
-  }
-
-  return client;
-}
-
-function createConvexReactiveClient(convexUrl: string, sessionToken?: string) {
-  const client = new ConvexClient(convexUrl);
-  if (typeof sessionToken === "string" && sessionToken.length > 0) {
-    client.setAuth(async () => sessionToken);
-  }
-
-  return client;
-}
-
-function getAuthenticatedClient(config: CliConfig) {
-  return createConvexHttpClient(config.convexUrl, config.sessionToken);
-}
-
-function getAuthenticatedReactiveClient(config: CliConfig) {
-  return createConvexReactiveClient(config.convexUrl, config.sessionToken);
-}
-
-export function createAndoCliClient(
-  config: Partial<CliConfig> & { convexUrl: string }
-): AndoCliClient {
-  const anonymousClient = createConvexHttpClient(config.convexUrl);
-  let authenticatedClient: ConvexHttpClient | null = null;
-  let reactiveClient: ConvexClient | null = null;
-  let bootstrapPromise: Promise<{
-    me: Me | null;
-    memberships: Membership[];
-  }> | null = null;
-
-  function requireAuthenticatedConfig(): CliConfig {
-    if (
-      typeof config.sessionToken !== "string" ||
-      config.sessionToken.length === 0
-    ) {
-      throw new Error(`OAuth session is required. Run "ando login" first.`);
-    }
-
-    return {
-      convexUrl: config.convexUrl,
-      sessionToken: config.sessionToken,
-    };
-  }
-
-  function requireAuthenticatedClient() {
-    if (authenticatedClient != null) {
-      return authenticatedClient;
-    }
-
-    authenticatedClient = getAuthenticatedClient(requireAuthenticatedConfig());
-    return authenticatedClient;
-  }
-
-  function requireReactiveClient() {
-    if (reactiveClient != null) {
-      return reactiveClient;
-    }
-
-    reactiveClient = getAuthenticatedReactiveClient(requireAuthenticatedConfig());
-    return reactiveClient;
-  }
-
-  async function sendEmailOtp(body: Shared.Contracts.SendEmailOtpBody) {
-    const response = (await anonymousClient.action(api.auth.sendEmailOtp, {
-      email: body.email,
-    })) as Shared.Contracts.SendEmailOtpResponse;
-
-    return Shared.Contracts.assertSendEmailOtpSucceeded(response);
-  }
-
-  async function discoverWorkspaces(
-    body: Shared.Contracts.DiscoverWorkspacesBody
-  ) {
-    const response = await anonymousClient.action(api.auth.discoverWorkspaces, {
-      email: body.email,
-      code: body.code,
-    });
-
-    return {
-      ...response,
-      workspaces: response.workspaces.map(adaptDiscoveredWorkspace),
-    };
-  }
-
-  async function selectWorkspace(body: Shared.Contracts.SelectWorkspaceBody) {
-    return await anonymousClient.action(api.auth.selectWorkspace, {
-      workspace_id: body.workspace_id,
-      intermediate_session_token: body.intermediate_session_token,
-    });
-  }
-
-  async function refreshSessionJwt(sessionToken: string) {
-    const response = (await anonymousClient.action(api.auth.refreshSessionJwt, {
-      session_jwt: sessionToken,
-    })) as AuthSessionResponse;
-
-    return response.session_jwt;
-  }
-
-  async function getBootstrap() {
-    if (bootstrapPromise != null) {
-      return await bootstrapPromise;
-    }
-
-    bootstrapPromise = requireAuthenticatedClient()
-      .query(api.app.bootstrap, {})
-      .then((result) => adaptBootstrap(result as BootstrapQueryResult))
-      .catch((error: unknown) => {
-        bootstrapPromise = null;
-        throw error;
-      });
-
-    return await bootstrapPromise;
-  }
-
-  async function getMe() {
-    return (await getBootstrap()).me;
-  }
-
-  async function getAllMemberships() {
-    return (await getBootstrap()).memberships;
-  }
-
-  async function getConversationMessagesPage(params: {
-    conversationId: string;
-    cursor?: string | null;
-    limit?: number;
-  }) {
-    return adaptConversationPage(
-      (await requireAuthenticatedClient().query(
-        api.app.listConversationMessagesPaginated,
-        {
-          conversationId: params.conversationId,
-          paginationOpts: {
-            cursor: params.cursor ?? null,
-            numItems: params.limit ?? 25,
-          },
-        }
-      )) as ConversationMessagesQueryResult
-    );
-  }
-
-  async function getConversationMessages(conversationId: string, limit = 25) {
-    return await getConversationMessagesPage({
-      conversationId,
-      limit,
-    });
-  }
-
-  async function getMessage(messageId: string) {
-    const message = await requireAuthenticatedClient().query(
-      api.app.getMessage,
-      {
-        messageId,
-      }
-    );
-
-    return message == null ? null : adaptMessage(message);
-  }
-
-  async function getThreadReplies(messageId: string) {
-    const replies = await requireAuthenticatedClient().query(
-      api.app.listThreadReplies,
-      {
-        messageId,
-      }
-    );
-
-    return replies.map(adaptMessage);
-  }
-
-  async function postMessage(params: {
-    conversationId: string;
-    markdownContent: string;
-    threadRootId?: string | null;
-  }) {
-    const message = await requireAuthenticatedClient().mutation(
-      api.app.createMessage,
-      {
-        conversationId: params.conversationId,
-        clientRequestId: null,
-        markdownContent: params.markdownContent,
-        explicitContextMessageIds: [],
-        imageUrls: [],
-        fileIds: [],
-        initiatorId: null,
-        suppressedLinkPreviewUrls: [],
-        callRootId: null,
-        threadRootMessageId: params.threadRootId ?? null,
-      }
-    );
-
-    return adaptMessage(message);
-  }
-
-  async function addReaction(messageId: string, emoji: string) {
-    const reaction = await requireAuthenticatedClient().mutation(
-      api.app.createReaction,
-      {
-        messageId,
-        emoji,
-      }
-    );
-
-    return {
-      success: true,
-      data: {
-        ...reaction,
-        created_at: new Date(reaction.created_at),
-      },
-    };
-  }
-
-  function subscribeToConversationMessages(params: {
-    conversationId: string;
-    limit?: number;
-    onUpdate: (page: ConversationPage) => void;
-  }) {
-    const client = requireReactiveClient();
-    const watch = client.watchQuery(api.app.listConversationMessagesPaginated, {
-      conversationId: params.conversationId,
-      paginationOpts: {
-        cursor: null,
-        numItems: params.limit ?? 25,
-      },
-    });
-
-    return watch.onUpdate(() => {
-      const result = watch.localQueryResult();
-      if (result != null) {
-        const page = adaptConversationPage(result as ConversationMessagesQueryResult);
-        params.onUpdate(page);
-      }
-    });
-  }
-
-  function subscribeToThreadReplies(params: {
-    threadRootId: string;
-    onUpdate: (replies: Message[]) => void;
-  }) {
-    const client = requireReactiveClient();
-    const watch = client.watchQuery(api.app.listThreadReplies, {
-      messageId: params.threadRootId,
-    });
-
-    return watch.onUpdate(() => {
-      const result = watch.localQueryResult();
-      if (result != null) {
-        const rawReplies =
-          result as unknown as Shared.Contracts.ConversationMessageExtended[];
-        const replies = rawReplies.map(adaptMessage);
-        params.onUpdate(replies);
-      }
-    });
-  }
-
-  async function close() {
-    if (reactiveClient != null) {
-      await reactiveClient.close();
-      reactiveClient = null;
-    }
-  }
-
-  return {
-    addReaction,
-    close,
-    createAuthenticatedCopy(sessionToken: string) {
-      return createAndoCliClient({
-        convexUrl: config.convexUrl,
-        sessionToken,
-      });
-    },
-    discoverWorkspaces,
-    getAllMemberships,
-    getConversationMessages,
-    getConversationMessagesPage,
-    getMe,
-    getMessage,
-    getThreadReplies,
-    postMessage,
-    refreshSessionJwt,
-    selectWorkspace,
-    sendEmailOtp,
-    subscribeToConversationMessages,
-    subscribeToThreadReplies,
-  };
-}