refactor: move api client to package

apps/code/package.json

@@ -129,6 +129,7 @@
     "@phosphor-icons/react": "^2.1.10",
     "@pierre/diffs": "^1.1.21",
     "@posthog/agent": "workspace:*",
+    "@posthog/api-client": "workspace:*",
     "@posthog/electron-trpc": "workspace:*",
     "@posthog/enricher": "workspace:*",
     "@posthog/git": "workspace:*",

apps/code/src/renderer/api/posthogClient.ts

@@ -1,6 +1,11 @@
 import type { SpendAnalysisResponse } from "@features/billing/types/spend-analysis";
 import { isSupportedReasoningEffort } from "@posthog/agent/adapters/reasoning-effort";
 import type { PermissionMode } from "@posthog/agent/execution-mode";
+import {
+  buildApiFetcher,
+  createApiClient,
+  type Schemas,
+} from "@posthog/api-client";
 import {
   DISMISSAL_REASON_OPTIONS,
   type DismissalReasonOptionValue,
@@ -36,8 +41,6 @@ import type { SeatData } from "@shared/types/seat";
 import { SEAT_PRODUCT_KEY } from "@shared/types/seat";
 import type { StoredLogEntry } from "@shared/types/session-events";
 import { logger } from "@utils/logger";
-import { buildApiFetcher } from "./fetcher";
-import { createApiClient, type Schemas } from "./generated";
 
 export class SeatSubscriptionRequiredError extends Error {
   redirectUrl: string;
@@ -573,6 +576,8 @@ export class PostHogAPIClient {
       buildApiFetcher({
         getAccessToken,
         refreshAccessToken,
+        appVersion:
+          typeof __APP_VERSION__ !== "undefined" ? __APP_VERSION__ : "unknown",
       }),
       baseUrl,
     );

apps/code/src/renderer/features/sessions/hooks/useChatTitleGenerator.ts

@@ -4,7 +4,7 @@ import {
   sessionStoreSetters,
   useSessionStore,
 } from "@features/sessions/stores/sessionStore";
-import type { Schemas } from "@renderer/api/generated";
+import type { Schemas } from "@posthog/api-client";
 import type { Task } from "@shared/types";
 import {
   enrichDescriptionWithFileContent,

apps/code/src/renderer/features/sidebar/components/SidebarMenu.tsx

@@ -14,9 +14,9 @@ import {
 import { useTasks, useUpdateTask } from "@features/tasks/hooks/useTasks";
 import { useWorkspaces } from "@features/workspace/hooks/useWorkspace";
 import { useTaskContextMenu } from "@hooks/useTaskContextMenu";
+import type { Schemas } from "@posthog/api-client";
 import { ScrollArea, Separator } from "@posthog/quill";
 import { Box, Flex } from "@radix-ui/themes";
-import type { Schemas } from "@renderer/api/generated";
 import { trpcClient } from "@renderer/trpc/client";
 import type { Task } from "@shared/types";
 import { useCommandMenuStore } from "@stores/commandMenuStore";

apps/code/src/renderer/features/sidebar/hooks/useSidebarData.ts

@@ -8,7 +8,7 @@ import {
   useTasks,
 } from "@features/tasks/hooks/useTasks";
 import { useWorkspaces } from "@features/workspace/hooks/useWorkspace";
-import type { Schemas } from "@renderer/api/generated";
+import type { Schemas } from "@posthog/api-client";
 import type { Task, TaskRunStatus } from "@shared/types";
 import { useEffect, useMemo, useRef } from "react";
 import { useSidebarStore } from "../stores/sidebarStore";

apps/code/src/renderer/features/tasks/hooks/useTasks.ts

@@ -3,7 +3,7 @@ import { workspaceApi } from "@features/workspace/hooks/useWorkspace";
 import { useAuthenticatedMutation } from "@hooks/useAuthenticatedMutation";
 import { useAuthenticatedQuery } from "@hooks/useAuthenticatedQuery";
 import { useMeQuery } from "@hooks/useMeQuery";
-import type { Schemas } from "@renderer/api/generated";
+import type { Schemas } from "@posthog/api-client";
 import { useFocusStore } from "@renderer/stores/focusStore";
 import { useNavigationStore } from "@renderer/stores/navigationStore";
 import { trpcClient } from "@renderer/trpc/client";

biome.jsonc

@@ -110,7 +110,10 @@
     },
     {
       // API client generates a lot of Any and uses codegen-specific formatting
-      "includes": ["apps/code/src/renderer/api/generated.ts"],
+      "includes": [
+        "apps/code/src/renderer/api/generated.ts",
+        "packages/api-client/src/generated.ts"
+      ],
       "linter": {
         "enabled": false
       },

packages/api-client/package.json

@@ -4,20 +4,24 @@
   "description": "Client for the PostHog API (auth, projects, task metadata, billing). Pure HTTPS, runs in any JS environment. Constructed via factory function — no DI container.",
   "private": true,
   "type": "module",
-  "scripts": {
-    "clean": "node ../../scripts/rimraf.mjs dist .turbo"
+  "exports": {
+    ".": "./src/index.ts",
+    "./*": [
+      "./src/*.ts",
+      "./src/*.tsx"
+    ]
   },
-  "dependencies": {
-    "@posthog/core": "workspace:*"
+  "scripts": {
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run",
+    "clean": "node ../../scripts/rimraf.mjs .turbo"
   },
   "devDependencies": {
     "@posthog/tsconfig": "workspace:*",
-    "@posthog/tsup-config": "workspace:*",
-    "tsup": "catalog:",
-    "typescript": "catalog:"
+    "typescript": "catalog:",
+    "vitest": "^2.1.9"
   },
   "files": [
-    "dist/**/*",
     "src/**/*"
   ]
 }

apps/code/src/renderer/api/fetcher.test.ts → packages/api-client/src/fetcher.test.ts

@@ -37,7 +37,11 @@ describe("buildApiFetcher", () => {
     const refreshAccessToken = vi.fn().mockResolvedValue("new-token");
     mockFetch.mockResolvedValueOnce(ok());
 
-    const fetcher = buildApiFetcher({ getAccessToken, refreshAccessToken });
+    const fetcher = buildApiFetcher({
+      getAccessToken,
+      refreshAccessToken,
+      appVersion: "test",
+    });
     await fetcher.fetch(mockInput);
 
     expect(getAccessToken).toHaveBeenCalledTimes(1);
@@ -52,7 +56,11 @@ describe("buildApiFetcher", () => {
     const refreshAccessToken = vi.fn().mockResolvedValue("new-token");
     mockFetch.mockResolvedValueOnce(err(401)).mockResolvedValueOnce(ok());
 
-    const fetcher = buildApiFetcher({ getAccessToken, refreshAccessToken });
+    const fetcher = buildApiFetcher({
+      getAccessToken,
+      refreshAccessToken,
+      appVersion: "test",
+    });
     const response = await fetcher.fetch(mockInput);
 
     expect(response.ok).toBe(true);
@@ -68,7 +76,11 @@ describe("buildApiFetcher", () => {
     const refreshAccessToken = vi.fn().mockResolvedValue("new-token");
     mockFetch.mockResolvedValueOnce(err(403, { detail: "Permission denied." }));
 
-    const fetcher = buildApiFetcher({ getAccessToken, refreshAccessToken });
+    const fetcher = buildApiFetcher({
+      getAccessToken,
+      refreshAccessToken,
+      appVersion: "test",
+    });
 
     await expect(fetcher.fetch(mockInput)).rejects.toThrow("[403]");
     expect(getAccessToken).toHaveBeenCalledTimes(1);
@@ -88,7 +100,11 @@ describe("buildApiFetcher", () => {
       )
       .mockResolvedValueOnce(ok());
 
-    const fetcher = buildApiFetcher({ getAccessToken, refreshAccessToken });
+    const fetcher = buildApiFetcher({
+      getAccessToken,
+      refreshAccessToken,
+      appVersion: "test",
+    });
     const response = await fetcher.fetch(mockInput);
 
     expect(response.ok).toBe(true);
@@ -105,6 +121,7 @@ describe("buildApiFetcher", () => {
     const fetcher = buildApiFetcher({
       getAccessToken: vi.fn().mockResolvedValue("token"),
       refreshAccessToken,
+      appVersion: "test",
     });
 
     await expect(fetcher.fetch(mockInput)).rejects.toThrow("[400]");
@@ -116,7 +133,11 @@ describe("buildApiFetcher", () => {
     const refreshAccessToken = vi.fn().mockResolvedValue("token-2");
     mockFetch.mockResolvedValueOnce(err(401)).mockResolvedValueOnce(err(401));
 
-    const fetcher = buildApiFetcher({ getAccessToken, refreshAccessToken });
+    const fetcher = buildApiFetcher({
+      getAccessToken,
+      refreshAccessToken,
+      appVersion: "test",
+    });
 
     await expect(fetcher.fetch(mockInput)).rejects.toThrow("[401]");
   });
@@ -128,7 +149,11 @@ describe("buildApiFetcher", () => {
       .mockRejectedValueOnce(new Error("failed"));
     mockFetch.mockResolvedValueOnce(err(401));
 
-    const fetcher = buildApiFetcher({ getAccessToken, refreshAccessToken });
+    const fetcher = buildApiFetcher({
+      getAccessToken,
+      refreshAccessToken,
+      appVersion: "test",
+    });
 
     await expect(fetcher.fetch(mockInput)).rejects.toThrow("[401]");
   });
@@ -138,6 +163,7 @@ describe("buildApiFetcher", () => {
     const fetcher = buildApiFetcher({
       getAccessToken: vi.fn().mockResolvedValue("token"),
       refreshAccessToken: vi.fn().mockResolvedValue("new-token"),
+      appVersion: "test",
     });
 
     await expect(fetcher.fetch(mockInput)).rejects.toThrow(

apps/code/src/renderer/api/fetcher.ts → packages/api-client/src/fetcher.ts

@@ -1,19 +1,24 @@
 import type { createApiClient } from "./generated";
 
-const USER_AGENT = `posthog/desktop.hog.dev; version: ${typeof __APP_VERSION__ !== "undefined" ? __APP_VERSION__ : "unknown"}`;
-
-export const buildApiFetcher: (config: {
+export type ApiFetcherConfig = {
   getAccessToken: () => Promise<string>;
   refreshAccessToken: () => Promise<string>;
-}) => Parameters<typeof createApiClient>[0] = (config) => {
+  appVersion: string;
+};
+
+export const buildApiFetcher: (
+  config: ApiFetcherConfig,
+) => Parameters<typeof createApiClient>[0] = (config) => {
+  const userAgent = `posthog/desktop.hog.dev; version: ${config.appVersion}`;
+
   const makeRequest = async (
     input: Parameters<Parameters<typeof createApiClient>[0]["fetch"]>[0],
     token: string,
   ): Promise<Response> => {
     const headers = new Headers();
     headers.set("Authorization", `Bearer ${token}`);
     headers.set("Content-Type", "application/json");
-    headers.set("User-Agent", USER_AGENT);
+    headers.set("User-Agent", userAgent);
 
     if (input.urlSearchParams) {
       input.url.search = input.urlSearchParams.toString();
@@ -56,7 +61,10 @@ export const buildApiFetcher: (config: {
     if (response.status === 401) return true;
     if (response.status !== 403) return false;
     try {
-      const body = await response.clone().json();
+      const body = (await response.clone().json()) as {
+        code?: string;
+        type?: string;
+      } | null;
       return (
         body?.code === "authentication_failed" ||
         body?.type === "authentication_error"

apps/code/src/renderer/api/generated.augment.d.ts → packages/api-client/src/generated.augment.ts

@@ -1,12 +1,12 @@
-import type { Schemas } from "./generated";
-
 // typed-openapi omits the `Schemas.` prefix when referencing
 // underscore-prefixed schema types from query-parameter positions inside
 // the Endpoints namespace. Re-declare them as members of Endpoints so the
 // unqualified references in `generated.ts` resolve via declaration merging.
 declare module "./generated" {
   namespace Endpoints {
-    type _DateRange = Schemas._DateRange;
-    type _LogPropertyFilter = Schemas._LogPropertyFilter;
+    type _DateRange = import("./generated").Schemas._DateRange;
+    type _LogPropertyFilter = import("./generated").Schemas._LogPropertyFilter;
   }
 }
+
+export {};

packages/api-client/src/index.ts

@@ -0,0 +1,4 @@
+import "./generated.augment";
+
+export { type ApiFetcherConfig, buildApiFetcher } from "./fetcher";
+export { createApiClient, type Schemas } from "./generated";