feat(agent): bundle rtk with the agent package

apps/code/electron-builder.ts

@@ -46,6 +46,7 @@ const config: Configuration = {
     "**/*.node",
     "**/spawn-helper",
     ".vite/build/claude-cli/**",
+    ".vite/build/rtk/**",
     ".vite/build/plugins/posthog/**",
     ".vite/build/codex-acp/**",
     ".vite/build/grammars/**",

apps/code/electron.vite.config.ts

@@ -22,6 +22,7 @@ import {
   copyDrizzleMigrations,
   copyEnricherGrammars,
   copyPosthogPlugin,
+  copyRtkBinary,
   fixFilenameCircularRef,
   getBuildDate,
   getGitCommit,
@@ -92,6 +93,7 @@ export default defineConfig(({ mode }) => {
         autoServicesPlugin(path.join(__dirname, "src/main/services")),
         fixFilenameCircularRef(),
         copyClaudeExecutable(),
+        copyRtkBinary(),
         copyPosthogPlugin(isDev),
         copyDrizzleMigrations(),
         copyCodexAcpBinaries(),

apps/code/src/main/di/bindings.ts

@@ -83,7 +83,14 @@ import type { UI_AUTH, UI_SERVICE } from "@posthog/core/ui/identifiers";
 import type { UIService } from "@posthog/core/ui/ui";
 import type { UPDATE_LIFECYCLE_SERVICE } from "@posthog/core/updates/identifiers";
 import type { UpdatesService } from "@posthog/core/updates/updates";
-import type { USAGE_HOST, UsageHost } from "@posthog/core/usage/identifiers";
+import type {
+  RTK_SAVINGS_HOST,
+  RTK_SAVINGS_REPORTER_SERVICE,
+  RtkSavingsHost,
+  USAGE_HOST,
+  UsageHost,
+} from "@posthog/core/usage/identifiers";
+import type { RtkSavingsReporter } from "@posthog/core/usage/rtk-savings-reporter";
 import type { ROOT_LOGGER, RootLogger } from "@posthog/di/logger";
 import type {
   CONNECTIVITY_CLIENT,
@@ -422,6 +429,8 @@ export interface MainBindings {
 
   // Usage
   [USAGE_HOST]: UsageHost;
+  [RTK_SAVINGS_HOST]: RtkSavingsHost;
+  [RTK_SAVINGS_REPORTER_SERVICE]: RtkSavingsReporter;
 
   // Links
   [MAIN_TASK_LINK_SERVICE]: TaskLinkService;

apps/code/src/main/di/container.ts

@@ -88,7 +88,8 @@ import {
   UPDATES_SERVICE,
 } from "@posthog/core/updates/identifiers";
 import { updatesCoreModule } from "@posthog/core/updates/updates.module";
-import { USAGE_HOST } from "@posthog/core/usage/identifiers";
+import { RTK_SAVINGS_HOST, USAGE_HOST } from "@posthog/core/usage/identifiers";
+import { rtkSavingsReporterModule } from "@posthog/core/usage/rtk-savings-reporter.module";
 import { usageMonitorModule } from "@posthog/core/usage/usage-monitor.module";
 import { ROOT_LOGGER, type RootLogger } from "@posthog/di/logger";
 import { listFilesContainingText } from "@posthog/git/queries";
@@ -238,6 +239,7 @@ import { ElectronUrlLauncher } from "../platform-adapters/electron-url-launcher"
 import { electronUsageThresholdStore } from "../platform-adapters/electron-usage-threshold-store";
 import { ElectronWorkspaceSettings } from "../platform-adapters/electron-workspace-settings";
 import { posthogNodeAnalytics } from "../platform-adapters/posthog-analytics";
+import { createRtkSavingsHost } from "../platform-adapters/rtk-savings-host";
 import { AppLifecycleService } from "../services/app-lifecycle/service";
 import {
   AuthPreferencePortAdapter,
@@ -638,6 +640,13 @@ container.bind(USAGE_HOST).toDynamicValue((ctx) => {
       electronUsageThresholdStore.setThresholdsSeen(value),
   };
 });
+container.load(rtkSavingsReporterModule);
+container
+  .bind(RTK_SAVINGS_HOST)
+  .toDynamicValue((ctx) =>
+    createRtkSavingsHost(ctx.get(BUNDLED_RESOURCES_SERVICE)),
+  )
+  .inSingletonScope();
 container.bind(MAIN_TASK_LINK_SERVICE).to(TaskLinkService);
 container.bind(TASK_LINK_SERVICE).toService(MAIN_TASK_LINK_SERVICE);
 container.bind(MAIN_INBOX_LINK_SERVICE).to(InboxLinkService);

apps/code/src/main/index.ts

@@ -33,6 +33,8 @@ import type { NotificationService } from "@posthog/core/notification/notificatio
 import { OAUTH_SERVICE } from "@posthog/core/oauth/identifiers";
 import type { OAuthService } from "@posthog/core/oauth/oauth";
 import type { UpdatesService } from "@posthog/core/updates/updates";
+import { RTK_SAVINGS_REPORTER_SERVICE } from "@posthog/core/usage/identifiers";
+import type { RtkSavingsReporter } from "@posthog/core/usage/rtk-savings-reporter";
 import { CONNECTIVITY_CLIENT } from "@posthog/host-router/ports/connectivity-client";
 import { ENVIRONMENT_CLIENT } from "@posthog/host-router/ports/environment-client";
 import { FILE_WATCHER_CONTROL } from "@posthog/host-router/ports/file-watcher-control";
@@ -247,6 +249,8 @@ async function initializeServices(): Promise<void> {
   const authService = container.get<AuthService>(AUTH_SERVICE);
   container.get<NotificationService>(NOTIFICATION_SERVICE);
   container.get<UpdatesService>(UPDATES_SERVICE);
+  // Eagerly resolved so its postConstruct schedules the daily gauge report.
+  container.get<RtkSavingsReporter>(RTK_SAVINGS_REPORTER_SERVICE);
   container.get<TaskLinkService>(TASK_LINK_SERVICE);
   container.get<InboxLinkService>(INBOX_LINK_SERVICE);
   container.get<ScoutLinkService>(SCOUT_LINK_SERVICE);

apps/code/src/main/platform-adapters/rtk-savings-host.ts

@@ -0,0 +1,43 @@
+import { createHash } from "node:crypto";
+import { existsSync } from "node:fs";
+import { userInfo } from "node:os";
+import {
+  BUNDLED_RTK_DIR,
+  bundledRtkBinName,
+  resolveRtkSavings,
+} from "@posthog/agent/server/rtk-savings";
+import type { RtkSavingsHost } from "@posthog/core/usage/identifiers";
+import type { IBundledResources } from "@posthog/platform/bundled-resources";
+import { machineId } from "node-machine-id";
+
+/**
+ * Reads the bundled rtk binary's cumulative savings tally for the desktop
+ * gauge report. The counter id hashes machine id + OS username because rtk's
+ * database lives in the OS user's app-data dir: two OS users on one machine
+ * are two distinct counters, and mixing their readings under one id would
+ * corrupt the consumer-side differencing.
+ */
+export function createRtkSavingsHost(
+  bundledResources: IBundledResources,
+): RtkSavingsHost {
+  let counterId: string | null = null;
+
+  return {
+    async readGauge() {
+      const binary = bundledResources.resolve(
+        `${BUNDLED_RTK_DIR}/${bundledRtkBinName()}`,
+      );
+      if (!existsSync(binary)) return null;
+
+      const summary = await resolveRtkSavings({
+        resolveBinary: () => binary,
+      });
+      if (!summary) return null;
+
+      counterId ??= createHash("sha256")
+        .update(`${await machineId()}:${userInfo().username}`)
+        .digest("hex");
+      return { counterId, ...summary };
+    },
+  };
+}

apps/code/vite-main-plugins.mts

@@ -27,6 +27,8 @@ import {
   targetArch,
   targetPlatform,
 } from "../../packages/agent/build/native-binary.mjs";
+// @ts-expect-error - plain ESM helper shared with packages/agent/tsup.config.ts
+import { rtkBinName } from "../../packages/agent/build/rtk-binary.mjs";
 
 export function getGitCommit(): string {
   if (process.env.BUILD_COMMIT) return process.env.BUILD_COMMIT;
@@ -62,6 +64,7 @@ export function fixFilenameCircularRef(): Plugin {
 }
 
 let claudeCliCopied = false;
+let rtkCopied = false;
 
 function verifyBinaryArch(destPath: string): void {
   // Best-effort: parse the binary's magic bytes and confirm the embedded arch
@@ -124,22 +127,22 @@ function isStagedCopyCurrent(source: string, dest: string): boolean {
   return statSync(dest).mtimeMs >= statSync(source).mtimeMs;
 }
 
-function signClaudeBinary(destPath: string): void {
+function signDarwinBinary(destPath: string): void {
   if (targetPlatform() !== "darwin") return;
   if (process.platform !== "darwin") {
     // Can't ad-hoc sign a darwin binary from a non-darwin build host; the
     // resulting app won't launch on Apple Silicon. Fail loud rather than
     // shipping an unrunnable bundle.
     throw new Error(
-      "[copy-claude-executable] Cannot ad-hoc sign darwin binary from non-darwin host. Build on macOS.",
+      `[sign-binary] Cannot ad-hoc sign ${destPath} from a non-darwin host. Build on macOS.`,
     );
   }
   try {
     execSync(`xattr -cr "${destPath}"`, { stdio: "inherit" });
     execSync(`codesign --force --sign - "${destPath}"`, { stdio: "inherit" });
   } catch (err) {
     console.warn(
-      "[copy-claude-executable] FAILED to ad-hoc sign binary; macOS will reject the bundled app:",
+      `[sign-binary] FAILED to ad-hoc sign ${destPath}; macOS will reject the bundled app:`,
       err,
     );
   }
@@ -212,12 +215,62 @@ export function copyClaudeExecutable(): Plugin {
       }
       copyClaudeSupportAssets(source, destDir);
       verifyBinaryArch(destBinary);
-      signClaudeBinary(destBinary);
+      signDarwinBinary(destBinary);
       claudeCliCopied = true;
     },
   };
 }
 
+// Stages the RTK binary the agent package vendored into its dist/rtk/ into the
+// Electron app's .vite/build/rtk/, mirroring copyClaudeExecutable so both hosts
+// ship one consistent rtk version. Best-effort: warns and skips if the agent
+// package hasn't bundled rtk (e.g. an offline agent build), and the agent then
+// falls back to whatever rtk is on PATH.
+export function copyRtkBinary(): Plugin {
+  return {
+    name: "copy-rtk-binary",
+    writeBundle() {
+      const binName = rtkBinName();
+      const destDir = join(__dirname, ".vite/build/rtk");
+      const destBinary = join(destDir, binName);
+
+      if (rtkCopied && existsSync(destBinary)) {
+        return;
+      }
+
+      if (!existsSync(destDir)) {
+        mkdirSync(destDir, { recursive: true });
+      }
+
+      const packageCandidates = [
+        join(__dirname, "node_modules/@posthog/agent/dist/rtk", binName),
+        join(__dirname, "../../node_modules/@posthog/agent/dist/rtk", binName),
+        join(__dirname, "../../packages/agent/dist/rtk", binName),
+      ];
+
+      const source = packageCandidates.find((p: string) => existsSync(p));
+      if (!source) {
+        console.warn(
+          `[copy-rtk-binary] rtk binary not bundled for ${targetPlatform()}-${targetArch()}; skipping (agent falls back to PATH).`,
+        );
+        return;
+      }
+
+      if (isStagedCopyCurrent(source, destBinary)) {
+        rtkCopied = true;
+        return;
+      }
+
+      copyFileSync(source, destBinary);
+      if (targetPlatform() !== "win32") {
+        execSync(`chmod +x "${destBinary}"`);
+      }
+      signDarwinBinary(destBinary);
+      rtkCopied = true;
+    },
+  };
+}
+
 function getFilesRecursive(dir: string): string[] {
   const files: string[] = [];
   for (const entry of readdirSync(dir)) {